change help icon, fix some bug fixes