fix 2 typos, add TODOs
fix warning on unused var
add a comment, remove an unused variable