Lots of minor changes, ROSModel almost completed