round 16 bug fixes nearly complete