Minor fixes and new breaking. Output format... grrr.