Rework some of the parsing logic, especially for Netflix
Added all parsers back in