Fix and add switches to make_db