Fixed the stuff that didn't work (that I found)