Did some editing. Hopefully didn't break everything.