Braces working in CLI, and a little more db work.