The GTAP-E: Model description and improvements