improved movements, added wave