Fixed some things...