More tweaks and changes to models