Fixed some stuff :P