Merged and fixed minor bugs from chaireg0