Eherot/storm 090 upgrade (and a lot of other cleanup)