Add delete and complete options
Fixing some functions