Bunches of cleanup, dos2unix on resume