Added delete method & a few other things