Minor BSFun refactoring and exp't results