Prepared for multiple villages handling; Added village switching; Minor style fixes