Fixed some stuff up.