adjust to latest awirc changes
improve normalization