made a couple fixes to controllers, finished all of the feature specs