Various fixes based on namcap recommendations
Merge pull request #116 from City-busz/namcap-fixes

Various fixes based on namcap recommendations