minor cleanup; updated grid test