changed collision and added jump