errors, bugs and todo updated in TODO.md