Improved parsing, and formatted output