Add bbdb and clean up some under-used bits.