Made some miscellaneous updates to controllers and services