Improve comments drastically, change merge type