Added TODO for pending changes and bugfixes