fix minor issues before release version 2.