Added some comments and TODO's

it looks nicer