Some other fixes and added Thomas