added grid, bugfixes