tiny changes + bugfixes + grid