Some bugs still going on