various tweaks, still working on syntaxhighlight.