improved several shredder-related things