Will rever this later: Change method of looking up baseband + misc fixes

Storing here to work on it on another computer