Updates from latest build - synchronized with Whoward's changes, updated latest happiness mechanics.