A bunch of work on the bug handling.