cleaned imports and made jumping better