Fixed jump detection, added Fin