Fixed some stuff that needed fixing.