incoporate feedback, remove todos, and make a few more clarifications