Some changes to controllers and things