Updated more entities and formatting
stuff