Tweaked Movement Pattern Slightly

Also cleaned up some code
cleaned out some unused scraps of code