Few comments and todo annotations added.