Integrated annotations for a couple of databases; updated bootstrap.py for a couple of databases; small documentation corrections.