bumps to v2.1 and fixes whitespace issues