nicer output

plus few minor improvements