suppress deprecated warnings
move off of deprecated macro
mark model restraint max methods as deprecated
clean up some uses of deprecated macros
pass models and names to contructors
clean up compiler macros a bit