Cleaned up redundant numCol/width, numRow/height variables - now they are all width and height, as I felt those names were more intuitive