some grid fixes, cleanup