Fixed (almost) jumping still a bit buggy though