Misc updates, comments for key store functionality