Correcting and updating bb_tools

Closes errors #1 and #2