Fixed few bugs
Key store for app