Mild refactoring of radio module

Also, fix that allows LSI to work