General Changes

The following is application wide:
1. Formatting cleanup
2. Typo fixing
3. Bug fixing