additions, fixes to grid