Fixed some stuff that was bugging me.

zzz