Work on controllers, some amendments to models etc