fixed some last minute bugs
Merge branch 'release/v2.1' into develop