solved minor bugs