Cleaning up line limits and two compile errors.