integrators: refactor a bit
enable grid