Changes

I don't think I've tested this yet here; should work, and should look more epic than the uber yellow new massages box of burningyoureyesout. (sorry for the long summary)