keyhelper rework, currently broken
fix broken p/q swap
cleanup
ui build keychain refactor