diff --git a/code/grammar_entries.lark b/code/grammar_entries.lark
index 455e486f..59fc239f 100644
--- a/code/grammar_entries.lark
+++ b/code/grammar_entries.lark
@@ -1,15 +1,21 @@
-start: title description property+ _E note? _E? building
+start: title description property+ (_E note)? _E building
 
-title: "# " /(?! ).+(?<! )/ "\n" _E                 // not starting or ending with a space
+title: "#" /(?! ).+(?<! )/ "\n" _E                 // not starting or ending with a space
 
 description: "_" /(?! ).+(?<![ _])/ "_\n" _E        // single line not ending with underscore
 
-property: "- " _key ": " _value "\n"                // a property on a single line "- key: value"
-_key: /(?! ).+?(?=:)/                               // key: everything until next ":"
-_value: /.+(?<! )/                                  // everything until the end of the line
-
-building: "## Building\n" _E property+ _E? note     // the "building" section
-
 note: /(?![\-#]).*\n/*                              // Unstructured text, not starting with - or #
 
-_E: /^$\n/m                                         // empty new line
\ No newline at end of file
+building: "## Building\n" (_E property+)? (_E note)?     // the "building" section
+
+property: "-" _key ":" _values "\n"?                // a property on a single line "- key: value"
+_key: /(?! ).+?(?=:)(?<! )/                         // key: everything until next ":", not beginning or ending with a space
+_values: [_value ("," _value)*]                     // a comma separated list
+_value: quoted_value | unquoted_value               // quoted or unquoted values
+quoted_value: /\".+?\"/                             // with quotation marks, can contain commas
+unquoted_value: /(?![ \"])[^,\n]+(?<![ ])/        // cannot contain commas, cannot start or end with quotation mark
+
+_E: /^$\n/m                                         // empty new line
+
+%import common.WS
+%ignore WS
\ No newline at end of file
diff --git a/code/maintenance_collect_inspiration_infos.py b/code/maintenance_collect_inspiration_infos.py
index 6b2e7021..8cc32d6c 100644
--- a/code/maintenance_collect_inspiration_infos.py
+++ b/code/maintenance_collect_inspiration_infos.py
@@ -28,11 +28,12 @@ if __name__ == "__main__":
     print('{} inspirations in the inspirations database'.format(len(inspirations)))
     osg.write_inspirations_info(inspirations)  # write again just to check integrity
 
-    osg_ui.run_simple_button_app('Maintenance inspirations', (('Duplicate check', duplicate_check),))
+    #osg_ui.run_simple_button_app('Maintenance inspirations', (('Duplicate check', duplicate_check),))
 
 
 
     # assemble info
+    entries = osg.read_entries()
     entries = osg.assemble_infos()
 
     # assemble inspirations info from entries
diff --git a/code/utils/osg.py b/code/utils/osg.py
index 0b4bb27a..9abf14ee 100644
--- a/code/utils/osg.py
+++ b/code/utils/osg.py
@@ -58,11 +58,19 @@ class ListingTransformer(lark.Transformer):
 # transformer
 class EntryTransformer(lark.Transformer):
 
-    def start(self, x):
-        d = {}
-        for key, value in x:
-            d[key] = value
-        return d
+    def unquoted_value(self, x):
+        return x[0].value
+
+    def quoted_value(self, x):
+        return x[0].value[1:-1]  # remove quotation marks
+
+    def property(self, x):
+        """
+        The key of a property will be converted to lower case and the value part is the second part
+        :param x:
+        :return:
+        """
+        return x[0].lower(), x[1:]
 
     def title(self, x):
         return 'title', x[0].value
@@ -70,18 +78,32 @@ class EntryTransformer(lark.Transformer):
     def description(self, x):
         return 'description', x[0].value
 
-    def property(self, x):
-        return str.casefold(x[0].value), x[1].value
-
     def note(self, x):
+        """
+        Optional
+        :param x:
+        :return:
+        """
+        if not x:
+            raise lark.Discard
         return 'note', x[0].value
 
     def building(self, x):
         d = {}
         for key, value in x:
+            if key in d:
+                raise RuntimeError('Key in entry appears twice')
             d[key] = value
         return 'building', d
 
+    def start(self, x):
+        d = {}
+        for key, value in x:
+            if key in d:
+                raise RuntimeError('Key in entry appears twice')
+            d[key] = value
+        return d
+
 
 regex_sanitize_name = re.compile(r"[^A-Za-z 0-9-+]+")
 regex_sanitize_name_space_eater = re.compile(r" +")
@@ -535,6 +557,44 @@ def write_inspirations_info(inspirations):
     utils.write_text(inspirations_file, content)
 
 
+def read_entries():
+    """
+    Parses all entries and assembles interesting infos about them.
+    """
+
+    # setup parser
+    grammar_file = os.path.join(code_path, 'grammar_entries.lark')
+    grammar = utils.read_text(grammar_file)
+    parser = lark.Lark(grammar, debug=False)
+
+    # setup transformer
+    transformer = EntryTransformer()
+
+    # a database of all important infos about the entries
+    entries = []
+
+    # iterate over all entries
+    for file, _, content in entry_iterator():
+
+        print(file)
+
+        # parse and transform entry content
+        try:
+            tree = parser.parse(content)
+            entry = transformer.transform(tree)
+        except Exception as e:
+            print(e)
+            continue
+
+        # add file information
+        entry['file'] = file
+
+        # add to list
+        entries.append(entry)
+
+    return entries
+
+
 def compare_entries_developers(entries, developers):
     """
     Cross checks the game entries lists and the developers lists.
diff --git a/entries/2moons_browsergame_engine.md b/entries/2moons_browsergame_engine.md
index eaa55275..792fd676 100644
--- a/entries/2moons_browsergame_engine.md
+++ b/entries/2moons_browsergame_engine.md
@@ -13,4 +13,3 @@ _Space browsergame framework._
 - Developer: Jan-Otto Kröpke, Ozan Kurt, Hilarious001
 
 ## Building
-
diff --git a/entries/boost_c++_libraries.md b/entries/boost_c++_libraries.md
index a95b3b9a..706f7a09 100644
--- a/entries/boost_c++_libraries.md
+++ b/entries/boost_c++_libraries.md
@@ -18,7 +18,7 @@ _Boost provides free peer-reviewed portable C++ source libraries._
 Uses its own Build process
 
 2017-11 (1.65.1)
-- Much is header only, but some parts require building
-- Follow [Getting started on Windows](https://www.boost.org/doc/libs/1_65_1/more/getting_started/windows.html) or [Getting started on Unix variants](https://www.boost.org/doc/libs/1_65_1/more/getting_started/unix-variants.html)
-- Building on Windows with MSVC 2017 requires a workaround (see [issue #13197](https://svn.boost.org/trac10/ticket/13197))
-- With MSVC 2015 run "bootstrap vc14" followed by "b2 toolset=msvc-14.0 stage"
\ No newline at end of file
+Much is header only, but some parts require building
+Follow [Getting started on Windows](https://www.boost.org/doc/libs/1_65_1/more/getting_started/windows.html) or [Getting started on Unix variants](https://www.boost.org/doc/libs/1_65_1/more/getting_started/unix-variants.html)
+Building on Windows with MSVC 2017 requires a workaround (see [issue #13197](https://svn.boost.org/trac10/ticket/13197))
+With MSVC 2015 run "bootstrap vc14" followed by "b2 toolset=msvc-14.0 stage"
diff --git a/entries/c-evo.md b/entries/c-evo.md
index 345f4401..127f4973 100644
--- a/entries/c-evo.md
+++ b/entries/c-evo.md
@@ -1,6 +1,6 @@
 # C-evo
 
-_C-evo is a freeware empire building game for Windows._
+_Empire building game._
 
 - Home: http://www.c-evo.org/
 - Media: https://en.wikipedia.org/wiki/C-evo
@@ -9,6 +9,6 @@ _C-evo is a freeware empire building game for Windows._
 - Keywords: strategy, clone, inspired by Civilization II, turn-based
 - Code repository: https://github.com/vn971/cevo.git (and also download http://c-evo.org/files/cevosrc.zip)
 - Code language: Pascal
-- Code license: Public domain (original project), GPL-3.0 (Github project) 
+- Code license: Public domain (original project), GPL-3.0 (Github project)
 
 ## Building
diff --git a/entries/commander_genius.md b/entries/commander_genius.md
index b15c4c33..358689a3 100644
--- a/entries/commander_genius.md
+++ b/entries/commander_genius.md
@@ -5,7 +5,7 @@ _Remake of Commander Keen Series._
 - Home: http://clonekeenplus.sourceforge.net/, https://sourceforge.net/projects/clonekeenplus/
 - State: mature
 - Download: http://clonekeenplus.sourceforge.net/download.php
-. Platform: Windows, Linux, Android
+- Platform: Windows, Linux, Android
 - Keywords: action, inspired by Commander Keen Series, remake
 - Code repository: https://gitlab.com/Dringgstein/Commander-Genius.git, https://github.com/albertz/commandergenius.git (+), https://github.com/pelya/commandergenius.git (+), https://github.com/gerstrong/Commander-Genius.git (+)
 - Code language: C, C++
diff --git a/entries/hopson-arcade.md b/entries/hopson-arcade.md
index 4814b3c2..107043a0 100644
--- a/entries/hopson-arcade.md
+++ b/entries/hopson-arcade.md
@@ -4,7 +4,7 @@ _Remake of Space Invaders and other small arcade games._
 
 - Home: https://github.com/Hopson97/Hopson-Arcade
 - State: mature
-- Platform. Linux
+- Platform: Linux
 - Keywords: arcade, inspired by Space Invaders, open content, remake
 - Code repository: https://github.com/Hopson97/Hopson-Arcade.git
 - Code language: C++
diff --git a/entries/libpng.md b/entries/libpng.md
index 7b9da923..24af267c 100644
--- a/entries/libpng.md
+++ b/entries/libpng.md
@@ -16,5 +16,5 @@ _libpng is the official PNG reference library._
 ## Building
 
 2017-12
-- On Windows CMake fails with "No CMAKE_ASM_COMPILER could be found." on "project(.. ASM)" with MSVC 2015 as generator
+On Windows CMake fails with "No CMAKE_ASM_COMPILER could be found." on "project(.. ASM)" with MSVC 2015 as generator
 
diff --git a/entries/micropolis.md b/entries/micropolis.md
index b3198807..abf58b97 100644
--- a/entries/micropolis.md
+++ b/entries/micropolis.md
@@ -1,6 +1,6 @@
 # Micropolis
 
-_Micropolis is the open source version of SimCity Classic from Maxis._
+_Remake of SimCity._
 
 - Home: https://micropolisonline.com/
 - Media: <https://en.wikipedia.org/wiki/SimCity_(1989_video_game)#Micropolis>
@@ -14,4 +14,5 @@ _Micropolis is the open source version of SimCity Classic from Maxis._
 ## Building
 
 - Build system: setup.py
-Many various parts
\ No newline at end of file
+
+Many various parts
diff --git a/entries/open_legend_rpg.md b/entries/open_legend_rpg.md
index d8e9de20..6f72536d 100644
--- a/entries/open_legend_rpg.md
+++ b/entries/open_legend_rpg.md
@@ -1,6 +1,6 @@
 # Open Legend RPG
 
-_A tabletop roleplaying game (or RPG) in which the players play the part of mighty heroes and wicked villains in order to tell stories of epic proportion._
+_The players play mighty heroes and wicked villains in order to tell stories of epic proportion._
 
 - Home: https://openlegendrpg.com
 - State: mature
@@ -9,4 +9,4 @@ _A tabletop roleplaying game (or RPG) in which the players play the part of migh
 - Code language: None
 - Code license: Custom (Open Legend Community License: https://github.com/openlegend/core-rules/blob/master/LICENSE.md)
 
-
+## Building
diff --git a/entries/pathogen_warrior.md b/entries/pathogen_warrior.md
index 805d3108..957b749c 100644
--- a/entries/pathogen_warrior.md
+++ b/entries/pathogen_warrior.md
@@ -11,5 +11,3 @@ _Simple game about matching a pathogen molecular structure on a hexagonal grid._
 - Developer: Jetro Lauha
 
 ## Building
-
-Build system:
\ No newline at end of file
diff --git a/entries/shotgun_debugger.md b/entries/shotgun_debugger.md
index 32f4189e..e184f6dd 100644
--- a/entries/shotgun_debugger.md
+++ b/entries/shotgun_debugger.md
@@ -12,4 +12,7 @@ _Shooting game which uses a 3d engine but allows 2d gameplay._
 - Code dependencies: SDL
 - Developer: Matthew Sarnoff (Game Creation Society), Chris DeLeon (Game Creation Society), John Nesky (Game Creation Society), Gregory Peng (Game Creation Society), Jeff Thoene (Game Creation Society), Tuscan Knox (music, Game Creation Society), Michael Weber (Game Creation Society)
 
-## Building system: VisualStudio
+## Building
+
+- Build system: VisualStudio
+
diff --git a/entries/simple_and_fast_multimedia_library.md b/entries/simple_and_fast_multimedia_library.md
index 3360baa8..ae584624 100644
--- a/entries/simple_and_fast_multimedia_library.md
+++ b/entries/simple_and_fast_multimedia_library.md
@@ -20,5 +20,4 @@ Does not contain tests.
 Includes precompiled libraries for various compilers in source folder _extlibs_.
 
 2017-12
-- Windows, CMake, MSVC 2015 builds
-
+Windows, CMake, MSVC 2015 builds
diff --git a/entries/simple_directmedia_layer.md b/entries/simple_directmedia_layer.md
index bde88120..0204c567 100644
--- a/entries/simple_directmedia_layer.md
+++ b/entries/simple_directmedia_layer.md
@@ -20,9 +20,9 @@ _Simple DirectMedia Layer is a cross-platform development library designed to pr
 2017-11 (2.0.7)
 + SDL 2.0.7 with MSVC 2015 via CMake 3.9 works
 
-## Projects
+Projects
 
 + [SDL_ttf 2.0](https://www.libsdl.org/projects/SDL_ttf/)
 + [SDL_net 2.0](https://www.libsdl.org/projects/SDL_net/)
 + [SDL_image 2.0](https://www.libsdl.org/projects/SDL_image/)
-+ [SDL_mixer 2.0](https://www.libsdl.org/projects/SDL_mixer/)
\ No newline at end of file
++ [SDL_mixer 2.0](https://www.libsdl.org/projects/SDL_mixer/)
diff --git a/entries/space_station_13.md b/entries/space_station_13.md
index 878b5ece..e25e53ca 100644
--- a/entries/space_station_13.md
+++ b/entries/space_station_13.md
@@ -13,11 +13,10 @@ _A community developed, multiplayer round-based role playing game, where players
 Uses the [Byond engine]() which is closed source!
 
 Open source versions:
-- https://tgstation13.org/ https://github.com/tgstation/tgstation
-- https://baystation12.net/ https://github.com/Baystation12/Baystation12/
-- https://www.paradisestation.org/forum/ https://github.com/ParadiseSS13/Paradise
-- https://github.com/ss13remake/ss13remake
-- https://github.com/griefly/griefly (not using Byond?)
++ https://tgstation13.org/ https://github.com/tgstation/tgstation
++ https://baystation12.net/ https://github.com/Baystation12/Baystation12/
++ https://www.paradisestation.org/forum/ https://github.com/ParadiseSS13/Paradise
++ https://github.com/ss13remake/ss13remake
++ https://github.com/griefly/griefly (not using Byond?)
 
 ## Building
-
diff --git a/entries/ss13_remake.md b/entries/ss13_remake.md
index d3ec9ab9..9be01eec 100644
--- a/entries/ss13_remake.md
+++ b/entries/ss13_remake.md
@@ -9,4 +9,4 @@ _Remake of Space Station 13._
 - Code language: C#
 - Code license: GPL-3.0
 
-## Building
\ No newline at end of file
+## Building
diff --git a/entries/team_tactics.md b/entries/team_tactics.md
index 35e619e7..c265a03e 100644
--- a/entries/team_tactics.md
+++ b/entries/team_tactics.md
@@ -11,3 +11,4 @@ _Multiplayer realtime team-based 2D combat._
 - Code language: Java
 - Code license: MIT
 
+## Building
diff --git a/entries/vassal.md b/entries/vassal.md
index 234fa531..dcf2ea72 100644
--- a/entries/vassal.md
+++ b/entries/vassal.md
@@ -15,4 +15,4 @@ Quite a few [VASSAL modules](http://www.vassalengine.org/wiki/Category:Modules).
 
 https://git.code.sf.net/p/vassalengine/listbridge, https://git.code.sf.net/p/vassalengine/site, https://git.code.sf.net/p/vassalengine/site-src, https://git.code.sf.net/p/vassalengine/vassal4-demo
 
-## Building
\ No newline at end of file
+## Building
diff --git a/entries/wargamer.md b/entries/wargamer.md
index 3caff4b8..ce1428ed 100644
--- a/entries/wargamer.md
+++ b/entries/wargamer.md
@@ -1,6 +1,6 @@
 # Wargamer
 
-_Open source development of the game Wargamer:Napoleon 1813 originally developed by Steven Green/Greenius, and published in 1999 by Empire Interactive._
+_Remake of Wargamer:Napoleon 1813._
 
 - Home: https://sourceforge.net/projects/wargamer/, http://wargamer.sourceforge.net/
 - State: mature, inactive since 2003
@@ -11,5 +11,6 @@ _Open source development of the game Wargamer:Napoleon 1813 originally developed
 - Code license: GPL-2.0
 
 May require original files?
+Wargamer: Napoleon 1813 originally developed by Steven Green/Greenius, and published in 1999 by Empire Interactive.
 
-## Building
\ No newline at end of file
+## Building
diff --git a/entries/xpilot.md b/entries/xpilot.md
index 4a94041e..da5c8e0f 100644
--- a/entries/xpilot.md
+++ b/entries/xpilot.md
@@ -14,4 +14,4 @@ _Multi-player 2D space game._
 
 See also [XPilot5](http://www.buckosoft.com/xpilot/xpilot5/), [JXPilot](https://sourceforge.net/projects/jxpilot/) or [XPilot-AI](/http://xpilot-ai.org/).
 
-## Building
\ No newline at end of file
+## Building