Added TODO and more sepc chars