fixed bugs added delete