add ack-and-a-half; cleanups