Fix more event things; circle tool