Added bitchy changes for BT, added a few modules