many bug fixes of doom