updated todo, bugs, and authors
merge