Added prototype of displaying errors on document save
Removed some deprecated TODOs