add some obsessive weirdening to the shortkey codec
fix error on last commit
more OCD cleanup
funnel all output through Output class, rather than using template engine. Fixes ampersand escaping issue