Touchups
Merge pull request #63 from CodePath-MAF/touchups

Touchups