Fixed some stuff in places.