Minor Refactors, Bluetooth Improvements