Fixed up some stuff. Also there was a merge that I didn't double check, unhelper style.