bluetooth fixes, rearranged firmware