Some bugs still remain