fixed handler binding, general housekeeping