regex fix, convert restructured, minor fixes