Little fixes here and there
Move "municipalities" into a local file