Removing jumping for now, cleaning up comments