split up lines, further regex fixes