Many small changes - except for STORM, all seems to be working