Fixed bug with block truncate preserving words. Other minor changes