Now using z to 'jump around', miscellaneous cleanups.