fixed typos
moved TODOs to issues