Bug fixes and todo list...