fix jump, and more improvements