several minor bugs solved
several minor bugs solved