more town-gen updates, mostly comments/cleanup