Continued model improvements
merge with Vincent