first round of removing bugs