delete added, some bug fixes too
All done - now cleaning the code (or refactoring) and comments