optimize junk finder; fix contents output; remove unused code; other misc stuff