A bunch of minor changes, and edits to swmm model.