finished adding TODOs; minor editing