Various updates. Controllers, models and more.