removed some stuff, fixed some strings