Hopefully fixed stuff, possibly broke stuff.