Some fixed bugs, and additional bug hunting tools.