bug fix new bugs remain