Various tweaks to models and controllers