More todo, and added roles to db sql file.
Merged from master, added another todo.