more robust formatting
room fixes