[#554] fixed circle/ellipse drawing in debug mode
[#553] small update for code consistency