-fix some stuff