Fixed a bug plus added a bunch of stuff for expanding columns and rows