Fix for issue #3, consistency changes for user module
Changes to the way keys are handled in story module