Fixed stuff, added stuff, probably broke stuff.