renamed controllers and added improvement suggestions to todo