Clean urls when we're done
Fix up some output and do some tidying