clkao: looks good to me (again) & fixed a few small issues