- fixed delete procedure
- set of minor fixes