some small cleanups
more information on jumpTo links are passed to templates