Some bugs solved.