updating truncation handling
removing last enhancement, it doesn't work right, and fixing a bug