Booster implement and minor bug fix