Final commit for tonight. Fixed some formatting and little things.