added additional entities and split constants from instancesZ
all uncommitted from last commit (attempt 2)