Cleanup, output and fixing some typos