round modeling cleanup
Merge branch 'round' into testing