Avoid some errors and make better output
fix a couple of bugs with the special page