Fix error pages
Whitespace (and semantic changes)