cleanup and better output
small updates