drawRect with rotation
and minor fixes
Additional angle check