Adjusted description
Checked final todo's