BP upgrade + minor clean-up...