added last 2.2
finishing and correcting typos
finishing and correcting typos fixing coinfilcts