merging Dhole's 4chan Chandler Fixes

Grabbing the latest updates from Dhole.