update to v2.0; clean documentation some; fix a test