final pass minor fixes