Parse and Layout Patching

Minor fixes across the board, meeting my code standards and layout.