fix some stuff :P