Controller & Model Fixes