added some safety stuff, and added call to villager's draw method,
however that needs to be fixed a little