updated controllers and error-handling