update & minor fix