fixed minor bugs
fixed minor bugs