fix for bluetooth
cleanup
perfect :D