cleanup TODO
update versions and fix bugs