Improved model performance (no longer "brute-force" around the entire grid)
Fixed tabs to spaces due to VS2013 porting