fixes
Multiple changes & fixes
Fixes gonna fix
Merge pull request #475 from owdqa/public_repo_fixes

Public repo fixes