Fixed bug with Grid having one too many points in x-direction. Some clean up as well.