updated UserCustomAction support, added ScriptBlocks and generic CustomActions