Adding doc comments & indenting lines
- Fixing indentation in headers
- Removing jail related things
Some definitions for test builds