minor bugs still there