Added some minor changes and a controller