house, keychain and other bug fixes
Merge pull request #26 from asniper/keychainFix

house, keychain and other bug fixes