Added annotations to the database; added 'distances' query keyword; updated to new bootstrap.py.