Minor updates

Minor updates before interfacing indexer with database.