resolve any bugs