<pre> support + several fixes