minor clean up and bug fix
minor changes
minor bug fix in deleting
u updating bug fix