minor changes and commenting
updated todo list