changed alert to include action

- removed unnecessary top comments
added debug log
Merge branch 'dev' into bugfix-branch