Additional editing and testing of village model

Edited and tested village model a little more. Now has more coverage. 
(also did some other stuff that I can't remember at the moment because I forgot to commit earlier. *facepalm*)