Fixxed some stuff