Enhancements/ensure minimum grid size 35

Address #35 #36 #41 and #42