Minor bug fixes, updated todo, ...