fix bugs; update version number to 2.0