Cleaned up Desires a bit, fixed a bug that caused incorrect Desires to be created from CraftCommand