small changes, fixed minor bugs