Better though still buggy movement