bug: indentation
new fixes
bugfix - do not empty the stack
fix when stack empty
fixes for deliverables, new TODOs