Entity.h now supports multiple children, minor convention and code changes