Fix minor typos
Fix merge and add credits