reviewed stormdata and some minor format changes