Fix some docs and typos
Clean up a bit
Person

Clean up a bit
add some todos
fix #106