Fixed a code merge clusterf*ck with manual patches
split function doesn't take the sep= arg in my version of python