Changed syntax for "ACTION"

Other general bugfixes