minor improvements, added drawEllipse