Minor bug fixes and format improvements...
Everything is getting better and better before we jump to the next step and add new features.