fixed major break bug, small movement bug