bug fixes; add secstore
8 files changed