merge, fixed minor bugs