new fixes

Thanks @asmeurer for the fixes.

The universal_newlines=True is not needed on windows for now because I had hard coded the proper regexes for it. I will fix this later.