Added TODO list for the emulator

And aligned comments in the code