refactored and fixed collision (mostly)

Still weird when you press against the bump and jump. Also, falling of
the bump is maybe weird?