Fixed some stuff...