nicer output and fix None