two bug fixes and two formatting suggestions
Merge pull request #1 from chaiken-verticloud/master

pull request from chaiken-verticloud "two bug fixes and two formatting changes"