1.2.2 update & minor fix