More town stuff, fix some js bugs