Made a few minor changes
fixed merge