cleanup some bugs, have some more models converging