fixed minor bugs
fixed minor issues