Release 2.0.0 and minor bug fixes