update Max GOP size and minor fixes for early return