More jump tweaks and code cleanup.
Updated: Makefile