Fixed up some stuff, too much to note here.