Fixed some stuff (delete button etc) also some comments