edits and fixes
Merge pull request #1 from balancerockmedia/dev

edits and fixes