Fixed dirty state of grid bug, added todos