Minor bug fixes, Added delete feature