update Max GOP size and minor fixes for early return-- review request#59