MOD : Found some issues and written down in TODO.txt