some additional update & fix