updated and removed some stuff