Cleanup and bug hunting.