Fixes

Master fixes, borer fixes, radio and language changes.