Matas: Minor overall refactor and fixed bugs#38

MT-superdev wants to merge 1 commit intowarestack:mainwarestack/watchflow:mainfrom

MT-superdev:matas/fix/pr-36-auditMT-superdev/watchflow:matas/fix/pr-36-auditCopy head branch name to clipboard