Improvements in erase(), Logging for save_submission()
Bugfix
Adding some conditions for the queue