fixed movements, added functionality