Pull request for major fixes

Oh dear