minor changes
add  #define BB_RFINH for simplification.
to be improved.
update