Block storage modifiers been added where appropriate.
fix typo in hashing funciton