Final Fixes to Formatting I think