Cleaned up models and properties
Revised property text