Some work on the manual, handlers in particular.