cleanup
added user move ability, yeay