corrected some
fixed a merge