fixed some corner cases in drawing code to get the same results as before with way...