Corners rework

Corners were not always properly handled

Fine tuned corner