Grid tool updates + fixes