Merged with removal of 2 segmentation faults.