fixing seg faults
fixed merge conflicts