Improved surface and boundary layer models for the Goddard Institute for Space Studies general circulation model