some fixes of release 1