fixing some Closure annotations

plenty still to do here