fix 3 action bugs