Add postion moving and some cleanup