fixed a bit of 027-2, -3 and -4 and cleanup sets futher