Fixed up some stuff I forget. Should commit more often...