some minor logic changes
Merge pull request #477 from daeks/upd_action

Fix: some minor logic changes