removed extra village definition + minor changes