Small bugfixes and inline documentation for the identity switch