Fix a ton of stuff and add grid points.