Bunch of stuff

Revolt. More localisation. Updated CBs.