Fixes on world grid, reduce number of constants.