Version 2.1 prep

Many changes preparatory to the release of version 2.1