jump logic fixes