Solved minor bugs.