0.25.04 (Nivve) lots of loc updates