Fix docs, update changelog and bump version to 2.1.1