Fixing stuff and implementing delete