Fixed bugs regarding skips + the grid.