AP done right.
Fixed bug in _mymodel
Clean up, and update property strings