Released version 2.1

Contains various minor polishing fixes