fix up grids and conditions

not going to bother with whitespace