movement pt2; random other fixes