Feature/jump

some improvements