Style updates plus a few functional updates
fixed small typo in static_cast
Merge branch 'feature/bbvb_tweak' into feature/bbvb