More fixes and neating