clean up command batons and work on adding npc upkeep/healing stuff