Modified some comments/ todos