Fixed some things that bothered me.