fixups
Merge pull request #4 from theClanApps/feature/Nick-fixups

fixups