Fixes password error
Fixes key store includes
Merge branch 'refactoring' into crap