comments and 'minor' fixes

btraverse seems like it doesn't work with mode 2