0.25.04 (Nivve) Lots of loc updates