More fixes and additions from seperation