better grid, fixes on constrains