Merge pull request #778 from guardian/story-tweaks

Story tweaks
not string type, var type
Merge pull request #779 from guardian/storage-fixb

not string type, var type
also handle 'tyoe' types
Merge pull request #780 from guardian/storage-fixb

also handle 'tyoe' types
Merge branch 'master' into story-tweaks