Merge changes from master

* Spacing in fTable().
* Better variable names in blocks().