Fixing movement, pick up, catching state and movement bugs