Started fixing code

Completely? finished fixing village code.  Weapons code up next!