Fixed Controllers somewhat, regenerated scaffolding to account for changes to models on some controllers