Fixed some constant errors and put some work into deciding about shit.