fixed minor bugs for working commit version