diff --git a/src/mol-script/transpilers/all.ts b/src/mol-script/transpilers/all.ts
index b1434278e0d8f047fc977efad2c3d49f33f3a520..01f98d6643f9a8ae9d39460cb13d7092301121d9 100644
--- a/src/mol-script/transpilers/all.ts
+++ b/src/mol-script/transpilers/all.ts
@@ -1,7 +1,9 @@
-/*
- * Copyright (c) 2017 MolQL contributors, licensed under MIT, See LICENSE file for more info.
+/**
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
+ *
+ * Adapted from MolQL project
  */
 
 import { transpiler as jmol } from './jmol/parser';
diff --git a/src/mol-script/transpilers/helper.ts b/src/mol-script/transpilers/helper.ts
index b649116dd1b5e170d69b151563e78015f4e08d96..90062fc78cbcfb128055963f45d67ce97bc69125 100644
--- a/src/mol-script/transpilers/helper.ts
+++ b/src/mol-script/transpilers/helper.ts
@@ -1,9 +1,11 @@
 /**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
  * @author Koya Sakuma <koya.sakuma.work@gmail.com>
+ *
+ * Adapted from MolQL project
  */
 
 import * as P from '../../mol-util/monadic-parser';
diff --git a/src/mol-script/transpilers/jmol/examples.ts b/src/mol-script/transpilers/jmol/examples.ts
index 5da0e8d5f2bc85b38f7ed2b268ca1c1652dedaac..e1fcac2892dc120472a9cea45197593ee3ff35af 100644
--- a/src/mol-script/transpilers/jmol/examples.ts
+++ b/src/mol-script/transpilers/jmol/examples.ts
@@ -1,8 +1,10 @@
-/*
- * Copyright (c) 2017 MolQL contributors, licensed under MIT, See LICENSE file for more info.
+/**
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author David Sehnal <david.sehnal@gmail.com>
+ *
+ * Adapted from MolQL project
  */
 
 export const examples = [{
diff --git a/src/mol-script/transpilers/jmol/markdown-docs.ts b/src/mol-script/transpilers/jmol/markdown-docs.ts
index 813fb82e71255db3e4f77c18a70df1c6a58b3809..15fd62c6de50ec23cd28b54c3ad629e5a2850377 100644
--- a/src/mol-script/transpilers/jmol/markdown-docs.ts
+++ b/src/mol-script/transpilers/jmol/markdown-docs.ts
@@ -1,8 +1,11 @@
-/*
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+/**
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author Koya Sakuma <koya.sakuma.work@gmail.com>
+ *
  * Adapted from MolQL project
-*/
+ */
 
 import { properties } from './properties';
 import { operators } from './operators';
diff --git a/src/mol-script/transpilers/jmol/operators.ts b/src/mol-script/transpilers/jmol/operators.ts
index b6d25ecb90256c55fc18f9daf07b51dcf1ec9238..ac9db6f007303ed416989fb0d243a30c555cc23e 100644
--- a/src/mol-script/transpilers/jmol/operators.ts
+++ b/src/mol-script/transpilers/jmol/operators.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Koya Sakuma <koya.sakuma.work@gmail.com>
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
diff --git a/src/mol-script/transpilers/jmol/parser.ts b/src/mol-script/transpilers/jmol/parser.ts
index 9af92200dd33849c52f8f1e5f149576ecd54daf7..d20f41ec46509ac6ca30b6ce924e3e0314f767cc 100644
--- a/src/mol-script/transpilers/jmol/parser.ts
+++ b/src/mol-script/transpilers/jmol/parser.ts
@@ -5,8 +5,7 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  *
  * Adapted from MolQL project
- **/
-
+ */
 
 import * as P from '../../../mol-util/monadic-parser';
 import * as h from '../helper';
diff --git a/src/mol-script/transpilers/jmol/properties.ts b/src/mol-script/transpilers/jmol/properties.ts
index 77fcf6792848b7323430981422e2c01aa4884c8c..566e6780f9d016016a77c0d20c3bde6b21e80308 100644
--- a/src/mol-script/transpilers/jmol/properties.ts
+++ b/src/mol-script/transpilers/jmol/properties.ts
@@ -1,8 +1,11 @@
-/*
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+/**
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author Koya Sakuma <koya.sakuma.work@gmail.com>
+ *
  * Adapted from MolQL project
-*/
+ */
 
 import { MolScriptBuilder } from '../../../mol-script/language/builder';
 const B = MolScriptBuilder;
diff --git a/src/mol-script/transpilers/jmol/symbols.ts b/src/mol-script/transpilers/jmol/symbols.ts
index 556ff5ad7fa79821e2359e3cb4aa6773d02d8d0f..6720acb588f1cf2d00efd09f8612e7b0d212e56e 100644
--- a/src/mol-script/transpilers/jmol/symbols.ts
+++ b/src/mol-script/transpilers/jmol/symbols.ts
@@ -1,8 +1,11 @@
-/*
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+/**
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author Koya Sakuma <koya.sakuma.work@gmail.com>
+ *
  * Adapted from MolQL project
-*/
+ */
 
 import { properties } from './properties';
 import { operators } from './operators';
diff --git a/src/mol-script/transpilers/pymol/examples.ts b/src/mol-script/transpilers/pymol/examples.ts
index 4145efc2cf7d22430445d9b441e1ced732bd50b6..c92105904b054ebf99667cd8c6bb05f706bf412b 100644
--- a/src/mol-script/transpilers/pymol/examples.ts
+++ b/src/mol-script/transpilers/pymol/examples.ts
@@ -1,9 +1,11 @@
 /**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author David Sehnal <david.sehnal@gmail.com>
  * @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
  */
 
 export const examples = [{
diff --git a/src/mol-script/transpilers/pymol/markdown-docs.ts b/src/mol-script/transpilers/pymol/markdown-docs.ts
index 7dfe9f675ea2c450aeb324e7607dd443295e5017..0740d545ea21ace645261db85b9922f5b76633fb 100644
--- a/src/mol-script/transpilers/pymol/markdown-docs.ts
+++ b/src/mol-script/transpilers/pymol/markdown-docs.ts
@@ -1,8 +1,10 @@
 /**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
  */
 
 import { properties } from './properties';
diff --git a/src/mol-script/transpilers/pymol/operators.ts b/src/mol-script/transpilers/pymol/operators.ts
index 65be0561a49f19db4c634c1aff555ef426f3c364..f1537e3e570788b9a38ecc2580a362ee1f849c3c 100644
--- a/src/mol-script/transpilers/pymol/operators.ts
+++ b/src/mol-script/transpilers/pymol/operators.ts
@@ -1,8 +1,10 @@
 /**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
  */
 
 import * as P from '../../../mol-util/monadic-parser';
diff --git a/src/mol-script/transpilers/pymol/parser.ts b/src/mol-script/transpilers/pymol/parser.ts
index 6f5ca1745709052495b2658caab00aadff0f6f4e..b730b2a3e5ed019a4f5ac1e074f397a5f53a6480 100644
--- a/src/mol-script/transpilers/pymol/parser.ts
+++ b/src/mol-script/transpilers/pymol/parser.ts
@@ -1,11 +1,14 @@
 /**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
  */
 
 // https://pymol.org/dokuwiki/doku.php?id=selection:alpha
+// https://pymolwiki.org/index.php/Selection_Algebra
 // https://github.com/evonove/pymol/blob/master/pymol/layer3/Selector.cpp
 
 import * as P from '../../../mol-util/monadic-parser';
diff --git a/src/mol-script/transpilers/pymol/properties.ts b/src/mol-script/transpilers/pymol/properties.ts
index 0b318a5be934387b562775725b7cb98368dd4e32..04c4bb716d5168507a81f1e211e879552c041b31 100644
--- a/src/mol-script/transpilers/pymol/properties.ts
+++ b/src/mol-script/transpilers/pymol/properties.ts
@@ -1,9 +1,11 @@
 /**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
- * @author Koya Sakuma
+ * @author Koya Sakuma <koya.sakuma.work@gmail.com>
+ *
+ * Adapted from MolQL project
  */
 
 import { MolScriptBuilder } from '../../../mol-script/language/builder';
diff --git a/src/mol-script/transpilers/pymol/symbols.ts b/src/mol-script/transpilers/pymol/symbols.ts
index 1e02f21bee62f005cc427f177c831b61264936d7..7e1c89586e408cea1880a9d38766c0eaa100c646 100644
--- a/src/mol-script/transpilers/pymol/symbols.ts
+++ b/src/mol-script/transpilers/pymol/symbols.ts
@@ -1,8 +1,10 @@
 /**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
  */
 
 import { properties } from './properties';
diff --git a/src/mol-script/transpilers/transpiler.ts b/src/mol-script/transpilers/transpiler.ts
index 65abb3cd52ad1cb5ba1cde9f50532cf72ee33083..1fe04bfc150a23330ec19e57870e5211f266c3ad 100644
--- a/src/mol-script/transpilers/transpiler.ts
+++ b/src/mol-script/transpilers/transpiler.ts
@@ -1,8 +1,10 @@
 /**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  * @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
  */
 
 import { Expression } from '../language/expression';
diff --git a/src/mol-script/transpilers/types.ts b/src/mol-script/transpilers/types.ts
index fc85f86ecd1b9e609fc3c64b0ed7eeb1f44d2946..1589b804262f896fe5bb817df51c85ba3df4a8c1 100644
--- a/src/mol-script/transpilers/types.ts
+++ b/src/mol-script/transpilers/types.ts
@@ -1,13 +1,14 @@
 /**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
  */
 
 import * as P from '../../mol-util/monadic-parser';
 import { Expression } from '../language/expression';
-// import Symbol from '../mini-lisp/symbol'
 
 export interface AtomGroupArgs {
     [index: string]: any
@@ -35,7 +36,7 @@ export interface Property {
     regex: RegExp
     map: (s: string) => any
     level: 'atom-test' | 'residue-test' | 'chain-test' | 'entity-test'
-    property?: any /* Symbol */
+    property?: Expression
 }
 
 export type PropertyDict = { [name: string]: Property }
diff --git a/src/mol-script/transpilers/vmd/examples.ts b/src/mol-script/transpilers/vmd/examples.ts
index b720dbd54b130924a566d07ab191c60526964f0a..fbc65d3bb12e29f4ad5c3d2fad2365f4757d52b4 100644
--- a/src/mol-script/transpilers/vmd/examples.ts
+++ b/src/mol-script/transpilers/vmd/examples.ts
@@ -1,8 +1,10 @@
 /**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
  */
 
 export const examples = [{
diff --git a/src/mol-script/transpilers/vmd/functions.ts b/src/mol-script/transpilers/vmd/functions.ts
index 3d428ca1da17aad50402378bb8921900ffecb858..a2db414a922cf3001456cd8c180ac38474ccbe2e 100644
--- a/src/mol-script/transpilers/vmd/functions.ts
+++ b/src/mol-script/transpilers/vmd/functions.ts
@@ -3,6 +3,8 @@
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
  */
 
 import { MolScriptBuilder } from '../../../mol-script/language/builder';
diff --git a/src/mol-script/transpilers/vmd/keywords.ts b/src/mol-script/transpilers/vmd/keywords.ts
index 85a4172cca0a4841e9ed4dd01a341f190cbc8012..8d783bf627806f13bd27f42f9fca81043c578cfa 100644
--- a/src/mol-script/transpilers/vmd/keywords.ts
+++ b/src/mol-script/transpilers/vmd/keywords.ts
@@ -1,8 +1,10 @@
 /**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
  */
 
 import * as h from '../helper';
diff --git a/src/mol-script/transpilers/vmd/markdown-docs.ts b/src/mol-script/transpilers/vmd/markdown-docs.ts
index 93a1851963c2e197b201f42dade461d4b66c108c..63a44f9ce3dc120cf0205627380be29627f58d5a 100644
--- a/src/mol-script/transpilers/vmd/markdown-docs.ts
+++ b/src/mol-script/transpilers/vmd/markdown-docs.ts
@@ -1,8 +1,10 @@
 /**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
  */
 
 import { properties } from './properties';
diff --git a/src/mol-script/transpilers/vmd/operators.ts b/src/mol-script/transpilers/vmd/operators.ts
index 8b3a29252281ec21abd1c0bdf956145fee7db13e..e3cddd364691a4aafa7489e91a7e2eac2a7e826e 100644
--- a/src/mol-script/transpilers/vmd/operators.ts
+++ b/src/mol-script/transpilers/vmd/operators.ts
@@ -1,8 +1,10 @@
 /**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
  */
 
 import * as P from '../../../mol-util/monadic-parser';
diff --git a/src/mol-script/transpilers/vmd/parser.ts b/src/mol-script/transpilers/vmd/parser.ts
index eeecd0733633df1b299c31a73c45030784d3605e..dbe9b7bda9f1386bc3c4e54a8ab33e023d4e4f5e 100644
--- a/src/mol-script/transpilers/vmd/parser.ts
+++ b/src/mol-script/transpilers/vmd/parser.ts
@@ -1,9 +1,11 @@
 /**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
  * @author Koya Sakuma <koya.sakuma.work@gmail.com>
+ *
+ * Adapted from MolQL project
  */
 
 import * as P from '../../../mol-util/monadic-parser';
diff --git a/src/mol-script/transpilers/vmd/properties.ts b/src/mol-script/transpilers/vmd/properties.ts
index 306b9e152265bfe8d914cf5d8087ae31ce314ce8..2cf506943f4965f3098b5ce794e3d201896ebd57 100644
--- a/src/mol-script/transpilers/vmd/properties.ts
+++ b/src/mol-script/transpilers/vmd/properties.ts
@@ -1,8 +1,10 @@
 /**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
  */
 
 import { MolScriptBuilder } from '../../../mol-script/language/builder';
diff --git a/src/mol-script/transpilers/vmd/symbols.ts b/src/mol-script/transpilers/vmd/symbols.ts
index bc6da7e1ac0969bec658c54556c63017cd5e1ccc..1740243d4e755c385cf264c915df58456d5d1838 100644
--- a/src/mol-script/transpilers/vmd/symbols.ts
+++ b/src/mol-script/transpilers/vmd/symbols.ts
@@ -1,8 +1,10 @@
 /**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author Panagiotis Tourlas <panagiot_tourlov@hotmail.com>
+ *
+ * Adapted from MolQL project
  */
 
 import { properties } from './properties';