nicer output, some fixes