Hand Formatting Bugfixing