changes some stuff around, renames other stuff