Fix a lot of CSV stuff, it looked icky, also corrected typos