More improvements to the hack.