updated some stuff and cleaned shits