Final fixes and preparations for version 2.1 release.