More changes, couldn't manage anything more. Tomorrow I'll try hard when everything is quiet