bugs still need to be fixed