Various small changes

Updates to match refactoring of database and additional functionality