Updated version to 2.1 and couple of typos