A few improvements/corrections to entity package comments, etc