fixed overzealous validation
fixed delete bug