diff --git a/app.py b/app.py
index ab84140c28306116feb6fe447fa947f8cd05325a..09372259b27d3b22e972abbe92aec16daf5adb2e 100644
--- a/app.py
+++ b/app.py
@@ -150,29 +150,9 @@ def index():
     return redirect(url_for("admin.index"))
 
 
-# Custom filter class
-class FilterLastNameBrown(BaseSQLAFilter):
-    def apply(self, query, value, alias=None):
-        if value == '1':
-            return query.filter(self.column == "Brown")
-        else:
-            return query.filter(self.column != "Brown")
-
-    def operation(self):
-        return 'is Brown'
-
-'''
-# Customized User model admin
-inline_form_options = {
-    'form_label': "Info item",
-    'form_columns': ['id', 'key', 'value'],
-    'form_args': None,
-    'form_extra_fields': None,
-}'''
-
 class AdvancedSoftwareView(sqla.ModelView):
     column_sortable_list = ('name', ('license', ("license.name", "license.version")) , ('softwarecategory', 'softwarecategory.name'), 'lastchanged', )
-    column_list = ('name', 'license', 'softwarecategory', 'links', 'architecture','programminglanguages', )
+    column_list = ('name', 'license', 'softwarecategory', 'links', 'architecture','programminglanguages','price', )
     inline_models = (Link,)
     column_hide_backrefs = False
     page_size = 100
@@ -198,7 +178,7 @@ class AdvancedSoftwareView(sqla.ModelView):
                 template = Template(file_.read())
             softwares = Software.query.filter(Software.id.in_(ids))
             for software_tool in softwares:
-                template.stream(name=software_tool.name).dump('../digitale-Methoden-wiki/Tool_' + software_tool.name.replace(' ','') + '.asciidoc', encoding='utf-8')
+                template.stream(software=software_tool).dump('../digitale-Methoden-wiki/Tool_' + software_tool.name.replace(' ','') + '.asciidoc', encoding='utf-8')
 
             softwareincategory = []
             software_categorys = SoftwareCategory.query.all()
@@ -271,9 +251,7 @@ class UserAdmin(sqla.ModelView):
     def _get_parent_list(self):
         # only show available pets in the form
         return Pet.query.filter_by(available=True).all()
-'''
 
-'''
 # Customized Post model admin
 class PostAdmin(sqla.ModelView):
     column_list = ['id', 'user', 'title', 'date', 'tags']
@@ -330,7 +308,7 @@ class PostAdmin(sqla.ModelView):
         # Just call parent class with predefined model.
         super(PostAdmin, self).__init__(Post, session)
 
-'''
+
 
 
 class TreeView(sqla.ModelView):
@@ -344,18 +322,18 @@ class ScreenView(sqla.ModelView):
 
     # Flask-admin can automatically detect the relevant filters for hybrid properties.
     column_filters = ('number_of_pixels',)
-
+'''
 
 # Create admin
 admin = admin.Admin(app, name='Softwaresammlung: Digitale Methoden', template_mode='bootstrap3')
 
 # Add views
 admin.add_view(AdvancedSoftwareView(Software, db.session))
-admin.add_view(sqla.ModelView(Feature, db.session))
-admin.add_view(sqla.ModelView(License, db.session, category="Other"))
-admin.add_view(sqla.ModelView(Link, db.session, category="Other"))
-admin.add_view(sqla.ModelView(SoftwareCategory, db.session, category="Other"))
-admin.add_sub_category(name="Andere Sammlungen", parent_name="Other")
+admin.add_view(sqla.ModelView(Feature, db.session, category="Weiteres"))
+admin.add_view(sqla.ModelView(License, db.session, category="Weiteres"))
+admin.add_view(sqla.ModelView(Link, db.session, category="Weiteres"))
+admin.add_view(sqla.ModelView(SoftwareCategory, db.session, category="Weiteres"))
+admin.add_sub_category(name="Andere Sammlungen", parent_name="Weiteres")
 admin.add_link(MenuLink(name="CRAN-R", url='https://cran.r-project.org/web/views/', category='Andere Sammlungen', target="_blank"))
 admin.add_link(MenuLink(name="ROpenSci", url='https://ropensci.org/packages/', category='Andere Sammlungen', target="_blank"))
 
@@ -407,7 +385,7 @@ def build_sample_db():
 
     cat_tracking = SoftwareCategory(name="datenschutzkonformes Tracking", short_description="Sammlung von Sensordaten/Logdaten oder Nutzungsdaten mit expliziter Einverständnis mittels Software auf dem Gerät.")
     cat_scraping = SoftwareCategory(name="Scraping", short_description="Tools im Zusammenhang mit Web-Scraping.")
-    cat_int = SoftwareCategory(name="Forschungsplattformen", short_description="Integrierte Forschungsumgebungen/Plattformen für sozialwissenschaftliche Forschung.")
+    cat_int = SoftwareCategory(name="Korpusanalyse", short_description="Integrierte Plattformen für die Analyse großer Textcorpora.")
     cat_qda = SoftwareCategory(name="QDA-Software", short_description="Computer-gestützte Analyse qualitativer Daten.")
     cat_tm = SoftwareCategory(name="Automatisierte Inhaltsanalyse/Text Mining", short_description="")
 
@@ -422,123 +400,156 @@ def build_sample_db():
     cat_net = SoftwareCategory(name="Netzwerkanalysen", short_description="social network analysis")
     cat_esmema = SoftwareCategory(name="ESM/EMA-Studien", short_description="Datenerhebung in 'natürlicher' Umgebung.")
     cat_transkript = SoftwareCategory(name="Audio-Transkription", short_description="Transkriptionssoftware")
-    cat_search = SoftwareCategory(name="Audio-Transkribtion", short_description="Transkriptionssoftware")
+    cat_search = SoftwareCategory(name="Suche", short_description="Software im Zusammenhang von erweiterter Suche in großen Textmengen")
     cat_misc = SoftwareCategory(name="Weiteres", short_description="Zu speziell zum Einordnen..")
 
     db.session.add(cat_tracking)
     db.session.add(cat_scraping)
     db.session.add(cat_int)
 
-    aware = Software(name="AWARE",
-                     short_description="",
-                     developer="",
-                     maintainer="",
-                     softwarecategory=cat_tracking,
-                     architecture="framework",
-                     license=lic_apache2)
-    db.session.add(aware)
-    db.session.add(Link(software=aware, type="website", url="http://www.awareframework.com/", comment=""))
-    db.session.add(Link(software=aware, type="repository", url="https://github.com/denzilferreira/aware-client", comment="android"))
-    db.session.add(Link(software=aware, type="repository", url="https://github.com/tetujin/aware-client-ios", comment="iOS"))
-    db.session.add(Link(software=aware, type="repository", url="https://github.com/tetujin/aware-client-osx", comment="OSX"))
-    db.session.add(Link(software=aware, type="repository", url="https://github.com/denzilferreira/aware-server", comment="server"))
-
-    meili = Software(name="MEILI",
-                     short_description="",
-                     developer="Adrian C. Prelipcean",
-                     maintainer="Adrian C. Prelipcean",
-                     softwarecategory=cat_tracking,
-                     architecture="framework",
-                     license=lic_gpl3)
-    db.session.add(meili)
-    db.session.add(Link(software=meili, type="repository", url="https://github.com/Badger-MEILI",
+    tool = Software(name="AWARE",
+                    short_description="",
+                    developer="",
+                    maintainer="",
+                    softwarecategory=cat_tracking,
+                    architecture="framework",
+                    license=lic_apache2,
+                    programminglanguages=[prol_java],
+                    price="")
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="http://www.awareframework.com/", comment=""))
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/denzilferreira/aware-client", comment="android"))
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/tetujin/aware-client-ios", comment="iOS"))
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/tetujin/aware-client-osx", comment="OSX"))
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/denzilferreira/aware-server", comment="server"))
+
+    tool = Software(name="MEILI",
+                    short_description="",
+                    developer="Adrian C. Prelipcean",
+                    maintainer="Adrian C. Prelipcean",
+                    softwarecategory=cat_tracking,
+                    architecture="framework",
+                    license=lic_gpl3,
+                    programminglanguages=[prol_java])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/Badger-MEILI",
                         comment="group"))
 
-    passivedatakit = Software(name="Passive Data Kit",
-                              short_description="",
-                              developer="Chris Karr",
-                              maintainer="Chris Karr",
-                              softwarecategory=cat_tracking,
-                              architecture="framework",
-                              license=lic_apache2,
-                              programminglanguages=[prol_py,prol_java])
-    db.session.add(passivedatakit)
-    db.session.add(Link(software=passivedatakit, type="website", url="https://passivedatakit.org/", comment=""))
-    db.session.add(Link(software=passivedatakit, type="repository", url="https://github.com/audaciouscode/PassiveDataKit-Django", comment="djangoserver"))
-    db.session.add(Link(software=passivedatakit, type="repository", url="https://github.com/audaciouscode/PassiveDataKit-Android", comment="android"))
-    db.session.add(Link(software=passivedatakit, type="repository", url="https://github.com/audaciouscode/PassiveDataKit-iOS", comment="iOS"))
-
-    rselenium = Software(name="RSelenium",
-                         developer="John Harrison",
-                         maintainer="Ju Yeong Kim",
-                         softwarecategory=cat_scraping,
-                         architecture="package",
-                         license=lic_agpl3)
-    db.session.add(rselenium)
-    db.session.add(Link(software=rselenium, type="repository", url="https://github.com/ropensci/RSelenium", comment=""))
-
-    amcat = Software(name="AmCAT",
-                     short_description="The Amsterdam Content Analysis Toolkit (AmCAT) is an open source infrastructure that makes it easy to do large-scale automatic and manual content analysis (text analysis) for the social sciences and humanities.",
-                     developer="Chris Karr",
-                     maintainer="Ju Yeong Kim",
-                     softwarecategory=cat_int,
-                     architecture="SaaS",
-                     license=lic_agpl3)
-    db.session.add(amcat)
-    db.session.add(Link(software=amcat, type="website", url="http://vanatteveldt.com/amcat/", comment="entwickler"))
-    db.session.add(Link(software=amcat, type="repository", url="https://github.com/amcat/amcat", comment=""))
-    db.session.add(Link(software=amcat, type="wiki", url="http://wiki.amcat.nl/3.4:AmCAT_Navigator_3", comment=""))
-
-    cosmos = Software(name="COSMOS",
-                     short_description="COSMOS Open Data Analytics software",
-                     developer="",
-                     maintainer="",
-                     softwarecategory=cat_int,
-                     architecture="standalone",
-                     license=lic_prop)
-    db.session.add(cosmos)
-    db.session.add(Link(software=cosmos, type="website", url="http://socialdatalab.net/COSMOS", comment=""))
+    tool = Software(name="Passive Data Kit",
+                    short_description="",
+                    developer="Chris Karr",
+                    maintainer="Chris Karr",
+                    softwarecategory=cat_tracking,
+                    architecture="framework",
+                    license=lic_apache2,
+                    programminglanguages=[prol_py,prol_java])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="https://passivedatakit.org/", comment=""))
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/audaciouscode/PassiveDataKit-Django", comment="djangoserver"))
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/audaciouscode/PassiveDataKit-Android", comment="android"))
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/audaciouscode/PassiveDataKit-iOS", comment="iOS"))
 
+    tool = Software(name="Scrapy",
+                    developer="",
+                    maintainer="",
+                    softwarecategory=cat_scraping,
+                    architecture="package",
+                    license=lic_bsd,
+                    programminglanguages=[prol_py])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="https://scrapy.org/", comment=""))
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/scrapy/scrapy", comment=""))
 
-    lcm = Software(name="LCM",
-                     short_description="Leipzig Corpus Miner a decentralized SaaS application for the analysis of very large amounts of news texts ",
-                     developer="Gregor Wiedeman, Andreas Niekler",
-                     maintainer="",
-                     softwarecategory=cat_int,
-                     architecture="framework",
-                     license=lic_lgpl)
-    db.session.add(lcm)
-    db.session.add(Link(software=lcm, type="website", url="http://lcm.informatik.uni-leipzig.de/generic.html", comment=""))
+    tool = Software(name="RSelenium",
+                    developer="John Harrison",
+                    maintainer="Ju Yeong Kim",
+                    softwarecategory=cat_scraping,
+                    architecture="package",
+                    license=lic_agpl3,
+                    programminglanguages=[prol_r])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/ropensci/RSelenium", comment=""))
+
+    tool = Software(name="AmCAT",
+                    short_description="The Amsterdam Content Analysis Toolkit (AmCAT) is an open source infrastructure that makes it easy to do large-scale automatic and manual content analysis (text analysis) for the social sciences and humanities.",
+                    developer="Chris Karr",
+                    maintainer="Ju Yeong Kim",
+                    softwarecategory=cat_int,
+                    architecture="SaaS",
+                    license=lic_agpl3,
+                    programminglanguages=[prol_py])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="http://vanatteveldt.com/amcat/", comment="entwickler"))
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/amcat/amcat", comment=""))
+    db.session.add(Link(software=tool, type="wiki", url="http://wiki.amcat.nl/3.4:AmCAT_Navigator_3", comment=""))
 
-    ilcm = Software(name="iLCM",
-                     short_description="The iLCM(LCM=Leipzig Corpus Miner) project pursues the development of an integrated research environment for the analysis of structured and unstructured data in a ‘Software as a Service’ architecture (SaaS). The research environment addresses requirements for the quantitative evaluation of large amounts of qualitative data using text mining methods and requirements for the reproducibility of data-driven research designs in the social sciences.",
-                     developer="Gregor Wiedeman, Andreas Niekler",
-                     maintainer="",
-                     architecture="SaaS",
-                     softwarecategory=cat_int,
-                     license=lic_lgpl)
-    db.session.add(ilcm)
-    db.session.add(Link(software=ilcm, type="website", url="https://ilcm.informatik.uni-leipzig.de/", comment=""))
+    tool = Software(name="COSMOS",
+                    short_description="COSMOS Open Data Analytics software",
+                    developer="",
+                    maintainer="",
+                    softwarecategory=cat_int,
+                    architecture="standalone",
+                    license=lic_prop,
+                    programminglanguages=[])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="http://socialdatalab.net/COSMOS", comment=""))
 
-    atlasti = Software(name="ATLAS.ti",
-                     short_description="",
-                     developer="",
-                     maintainer="",
-                     softwarecategory=cat_qda,
-                     architecture="standalone",
-                     license=lic_prop)
-    db.session.add(atlasti)
-    db.session.add(Link(software=atlasti, type="website", url="https://atlasti.com/de/produkt/what-is-atlas-ti/", comment=""))
+    tool = Software(name="CWB",
+                    short_description=" a fast, powerful and extremely flexible corpus querying system",
+                    developer="",
+                    maintainer="",
+                    softwarecategory=cat_int,
+                    architecture="framework",
+                    license=lic_gpl3,
+                    programminglanguages=[prol_c])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="http://cwb.sourceforge.net/index.php", comment=""))
+    db.session.add(Link(software=tool, type="repository", url="http://svn.code.sf.net/p/cwb/code/cwb/trunk", comment="cwb"))
+    db.session.add(Link(software=tool, type="repository", url="http://svn.code.sf.net/p/cwb/code/gui/cqpweb/trunk", comment="cqpweb"))
 
-    leximancer = Software(name="Leximancer",
-                     short_description="Leximancer automatically analyses your text documents to identify the high level concepts in your text documents, delivering the key ideas and actionable insights you need with powerful interactive visualisations and data exports.",
-                     developer="",
-                     maintainer="",
-                     softwarecategory=cat_qda,
-                     architecture="standalone",
-                     license=lic_prop)
-    db.session.add(leximancer)
-    db.session.add(Link(software=leximancer, type="website", url="https://info.leximancer.com/", comment=""))
+    tool = Software(name="LCM",
+                    short_description="Leipzig Corpus Miner a decentralized SaaS application for the analysis of very large amounts of news texts ",
+                    developer="Gregor Wiedeman, Andreas Niekler",
+                    maintainer="",
+                    softwarecategory=cat_int,
+                    architecture="framework",
+                    license=lic_lgpl,
+                    programminglanguages=[prol_java,prol_r])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="http://lcm.informatik.uni-leipzig.de/generic.html", comment=""))
+
+    tool = Software(name="iLCM",
+                    short_description="The iLCM(LCM=Leipzig Corpus Miner) project pursues the development of an integrated research environment for the analysis of structured and unstructured data in a ‘Software as a Service’ architecture (SaaS). The research environment addresses requirements for the quantitative evaluation of large amounts of qualitative data using text mining methods and requirements for the reproducibility of data-driven research designs in the social sciences.",
+                    developer="Gregor Wiedeman, Andreas Niekler",
+                    maintainer="",
+                    architecture="SaaS",
+                    softwarecategory=cat_int,
+                    license=lic_lgpl,
+                    programminglanguages=[prol_java,prol_py,prol_r])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="https://ilcm.informatik.uni-leipzig.de/", comment=""))
+
+    tool = Software(name="ATLAS.ti",
+                    short_description="",
+                    developer="",
+                    maintainer="",
+                    softwarecategory=cat_qda,
+                    architecture="standalone",
+                    license=lic_prop,
+                    programminglanguages=[])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="https://atlasti.com/de/produkt/what-is-atlas-ti/", comment=""))
+
+    tool = Software(name="Leximancer",
+                    short_description="Leximancer automatically analyses your text documents to identify the high level concepts in your text documents, delivering the key ideas and actionable insights you need with powerful interactive visualisations and data exports.",
+                    developer="",
+                    maintainer="",
+                    softwarecategory=cat_qda,
+                    architecture="standalone",
+                    license=lic_prop,
+                    programminglanguages=[])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="https://info.leximancer.com/", comment=""))
 
     tool = Software(name="MAXQDA",
                     short_description="",
@@ -546,15 +557,17 @@ def build_sample_db():
                     maintainer="",
                     softwarecategory=cat_qda,
                     architecture="standalone",
-                    license=lic_prop)
+                    license=lic_prop,
+                    programminglanguages=[])
     db.session.add(tool)
-    db.session.add(Link(software=tool, type="website", url="https://www.rrz.uni-hamburg.de/services/software/alphabetisch/maxqda.html", comment=""))
+    db.session.add(Link(software=tool, type="website", url="https://www.rrz.uni-hamburg.de/services/software/alphabetisch/maxqda.html", comment="uhh"))
 
     tool = Software(name="NVivo",
                     short_description="",
                     developer="",
                     maintainer="",
                     softwarecategory=cat_qda,
+                    architecture="standalone",
                     license=lic_prop,
                     programminglanguages=[])
     db.session.add(tool)
@@ -565,6 +578,7 @@ def build_sample_db():
                     developer="",
                     maintainer="",
                     softwarecategory=cat_qda,
+                    architecture="standalone",
                     license=lic_prop,
                     programminglanguages=[])
     db.session.add(tool)
@@ -575,18 +589,20 @@ def build_sample_db():
                     developer="",
                     maintainer="",
                     softwarecategory=cat_qda,
+                    architecture="standalone",
                     license=lic_prop,
                     programminglanguages=[])
     db.session.add(tool)
     db.session.add(Link(software=tool, type="website", url="http://netanomics.com/", comment=""))
 
     tool = Software(name="Quirkos",
-                     short_description="",
-                     developer="",
-                     maintainer="",
-                     softwarecategory=cat_qda,
-                     license=lic_prop,
-                     programminglanguages=[])
+                    short_description="",
+                    developer="",
+                    maintainer="",
+                    softwarecategory=cat_qda,
+                    architecture="standalone",
+                    license=lic_prop,
+                    programminglanguages=[])
     db.session.add(tool)
     db.session.add(Link(software=tool, type="website", url="https://www.quirkos.com/", comment=""))
     db.session.add(Link(software=tool, type="repository", url="", comment=""))
@@ -596,6 +612,7 @@ def build_sample_db():
                     developer="Ronggui Huang",
                     maintainer="Ronggui Huang",
                     softwarecategory=cat_qda,
+                    architecture="package",
                     license=lic_bsd,
                     programminglanguages=[prol_r])
     db.session.add(tool)
@@ -607,6 +624,7 @@ def build_sample_db():
                     developer="",
                     maintainer="",
                     softwarecategory=cat_qda,
+                    architecture="standalone",
                     license=lic_gpl2,
                     programminglanguages=[])
     db.session.add(tool)
@@ -636,29 +654,29 @@ def build_sample_db():
     db.session.add(Link(software=tool, type="website", url="https://gate.ac.uk/overview.html", comment=""))
     db.session.add(Link(software=tool, type="repository", url="https://github.com/GateNLP/gate-core", comment=""))
 
-    tool = Software(name="NLTK",
-                    short_description="NLTK is a leading platform for building Python programs to work with human language data. It provides easy-to-use interfaces to over 50 corpora and lexical resources such as WordNet, along with a suite of text processing libraries for classification, tokenization, stemming, tagging, parsing, and semantic reasoning, wrappers for industrial-strength NLP libraries, and an active discussion forum.",
+    tool = Software(name="Gensim",
+                    short_description="Gensim is a Python library for topic modelling, document indexing and similarity retrieval with large corpora. Target audience is the natural language processing (NLP) and information retrieval (IR) community.",
                     developer="",
                     maintainer="",
                     softwarecategory=cat_tm,
                     architecture="package",
-                    license=lic_apache2,
+                    license=lic_lgpl,
                     programminglanguages=[prol_py])
     db.session.add(tool)
-    db.session.add(Link(software=tool, type="website", url="http://www.nltk.org/index.html", comment=""))
-    db.session.add(Link(software=tool, type="repository", url="https://github.com/nltk/nltk", comment=""))
+    db.session.add(Link(software=tool, type="website", url="https://pypi.org/project/gensim/", comment=""))
+    db.session.add(Link(software=tool, type="repository", url="", comment=""))
 
-    tool = Software(name="Gensim",
-                    short_description="Gensim is a Python library for topic modelling, document indexing and similarity retrieval with large corpora. Target audience is the natural language processing (NLP) and information retrieval (IR) community.",
+    tool = Software(name="NLTK",
+                    short_description="NLTK is a leading platform for building Python programs to work with human language data. It provides easy-to-use interfaces to over 50 corpora and lexical resources such as WordNet, along with a suite of text processing libraries for classification, tokenization, stemming, tagging, parsing, and semantic reasoning, wrappers for industrial-strength NLP libraries, and an active discussion forum.",
                     developer="",
                     maintainer="",
                     softwarecategory=cat_tm,
                     architecture="package",
-                    license=lic_lgpl,
+                    license=lic_apache2,
                     programminglanguages=[prol_py])
     db.session.add(tool)
-    db.session.add(Link(software=tool, type="website", url="https://pypi.org/project/gensim/", comment=""))
-    db.session.add(Link(software=tool, type="repository", url="", comment=""))
+    db.session.add(Link(software=tool, type="website", url="http://www.nltk.org/index.html", comment=""))
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/nltk/nltk", comment=""))
 
     tool = Software(name="Pandas",
                     short_description="",
@@ -672,6 +690,42 @@ def build_sample_db():
     db.session.add(Link(software=tool, type="website", url="http://pandas.pydata.org/", comment=""))
     db.session.add(Link(software=tool, type="repository", url="https://github.com/pandas-dev/pandas", comment=""))
 
+    tool = Software(name="polmineR",
+                    short_description="",
+                    developer="Andreas Blätte",
+                    maintainer="Andreas Blätte",
+                    softwarecategory=cat_tm,
+                    architecture="package",
+                    license=lic_gpl3,
+                    programminglanguages=[prol_r])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="https://cran.r-project.org/package=polmineR", comment="cran"))
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/PolMine/polmineR", comment=""))
+
+    tool = Software(name="quanteda",
+                    short_description="The package is designed for R users needing to apply natural language processing to texts, from documents to final analysis. Its capabilities match or exceed those provided in many end-user software applications, many of which are expensive and not open source. The package is therefore of great benefit to researchers, students, and other analysts with fewer financial resources. While using quanteda requires R programming knowledge, its API is designed to enable powerful, efficient analysis with a minimum of steps. By emphasizing consistent design, furthermore, quanteda lowers the barriers to learning and using NLP and quantitative text analysis even for proficient R programmers.",
+                    developer="Kenneth Benoit",
+                    maintainer="Kenneth Benoit",
+                    softwarecategory=cat_tm,
+                    architecture="package",
+                    license=lic_gpl3,
+                    programminglanguages=[prol_r])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="https://quanteda.io/", comment=""))
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/quanteda/quanteda", comment=""))
+
+    tool = Software(name="RapidMiner",
+                    short_description="",
+                    developer="",
+                    maintainer="",
+                    softwarecategory=cat_tm,
+                    architecture="framework",
+                    license=lic_agpl3,
+                    programminglanguages=[prol_java])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="https://rapidminer.com/", comment=""))
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/rapidminer/rapidminer-studio", comment=""))
+
     tool = Software(name="spaCy",
                     short_description=" spaCy excels at large-scale information extraction tasks. It's written from the ground up in carefully memory-managed Cython. Independent research has confirmed that spaCy is the fastest in the world. If your application needs to process entire web dumps, spaCy is the library you want to be using.",
                     developer="",
@@ -684,17 +738,17 @@ def build_sample_db():
     db.session.add(Link(software=tool, type="website", url="https://spacy.io/", comment=""))
     db.session.add(Link(software=tool, type="repository", url="https://github.com/explosion/spaCy", comment=""))
 
-    tool = Software(name="RapidMiner",
+    tool = Software(name="Stanford CoreNLP",
                     short_description="",
                     developer="",
                     maintainer="",
                     softwarecategory=cat_tm,
                     architecture="framework",
-                    license=lic_agpl3,
+                    license=lic_gpl3,
                     programminglanguages=[prol_java])
     db.session.add(tool)
-    db.session.add(Link(software=tool, type="website", url="https://rapidminer.com/", comment=""))
-    db.session.add(Link(software=tool, type="repository", url="https://github.com/rapidminer/rapidminer-studio", comment=""))
+    db.session.add(Link(software=tool, type="website", url="https://stanfordnlp.github.io/CoreNLP/", comment=""))
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/stanfordnlp/CoreNLP", comment=""))
 
     tool = Software(name="tm",
                     short_description="",
@@ -709,18 +763,6 @@ def build_sample_db():
     db.session.add(Link(software=tool, type="website", url="https://cran.r-project.org/package=tm", comment="cran"))
     db.session.add(Link(software=tool, type="repository", url="", comment=""))
 
-    tool = Software(name="Stanford CoreNLP",
-                    short_description="",
-                    developer="",
-                    maintainer="",
-                    softwarecategory=cat_tm,
-                    architecture="framework",
-                    license=lic_gpl3,
-                    programminglanguages=[prol_java])
-    db.session.add(tool)
-    db.session.add(Link(software=tool, type="website", url="https://stanfordnlp.github.io/CoreNLP/", comment=""))
-    db.session.add(Link(software=tool, type="repository", url="https://github.com/stanfordnlp/CoreNLP", comment=""))
-
     tool = Software(name="xtas",
                     short_description="the eXtensible Text Analysis Suite(xtas) is a collection of natural language processing and text mining tools, brought together in a single software package with built-in distributed computing and support for the Elasticsearch document store.",
                     developer="",
@@ -812,9 +854,22 @@ def build_sample_db():
                     license=lic_gpl3,
                     programminglanguages=[prol_java])
     db.session.add(tool)
-    db.session.add(Link(software=tool, type="website", url="", comment=""))
+    db.session.add(Link(software=tool, type="website", url="https://gephi.org/", comment=""))
     db.session.add(Link(software=tool, type="repository", url="https://github.com/gephi/gephi/", comment=""))
 
+    tool = Software(name="CATMA",
+                    short_description="CATMA (Computer Assisted Text Markup and Analysis) is a practical and intuitive tool for text researchers. In CATMA users can combine the hermeneutic, ‘undogmatic’ and the digital, taxonomy based approach to text and corpora—as a single researcher, or in real-time collaboration with other team members.",
+                    developer="",
+                    maintainer="",
+                    softwarecategory=cat_kollab_anno,
+                    architecture="package",
+                    license=lic_apache2,
+                    programminglanguages=[prol_py])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="http://catma.de/", comment=""))
+    db.session.add(Link(software=tool, type="website", url="https://www.slm.uni-hamburg.de/germanistik/forschung/forschungsprojekte/catma.html", comment="uhh"))
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/mpetris/catma", comment=""))
+
     tool = Software(name="WebAnno",
                     short_description="WebAnno is a multi-user tool supporting different roles such as annotator, curator, and project manager. The progress and quality of annotation projects can be monitored and measuered in terms of inter-annotator agreement. Multiple annotation projects can be conducted in parallel.",
                     developer="",
@@ -884,6 +939,8 @@ def build_sample_db():
                     license=lic_prop,
                     programminglanguages=[])
     db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="https://www.rrz.uni-hamburg.de/services/software/software-thematisch/statistik/stata.html", comment = "uhh"))
+
 
     tool = Software(name="STATA",
                     short_description="",
@@ -894,6 +951,7 @@ def build_sample_db():
                     license=lic_prop,
                     programminglanguages=[])
     db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="https://www.rrz.uni-hamburg.de/services/software/software-thematisch/statistik/spss-netzlizenz.html", comment = "uhh"))
 
     tool = Software(name="Nowcasting",
                     short_description="",
@@ -1009,6 +1067,19 @@ def build_sample_db():
     db.session.add(f4analyse)
     db.session.add(Link(software=f4analyse, type="website", url="https://www.audiotranskription.de/f4-analyse", comment=""))
 
+    tool = Software(name="EXMARaLDA",
+                    short_description="EXMARaLDA ist ein System für das computergestützte Arbeiten mit (vor allem) mündlichen Korpora. Es besteht aus einem Transkriptions- und Annotationseditor (Partitur-Editor), einem Tool zum Verwalten von Korpora (Corpus-Manager) und einem Such- und Analysewerkzeug (EXAKT).",
+                    developer="",
+                    maintainer="",
+                    softwarecategory=cat_transkript,
+                    architecture="framework",
+                    license=lic_unknown,
+                    programminglanguages=[prol_java])
+    db.session.add(tool)
+    db.session.add(Link(software=tool, type="website", url="", comment=""))
+    db.session.add(Link(software=tool, type="repository", url="https://github.com/EXMARaLDA/exmaralda", comment=""))
+
+
     '''
      tool = Software(name="",
                      short_description="",
diff --git a/sample_db.sqlite b/sample_db.sqlite
index 3bc7e19397a6df5438c954dcfab7a6f1cde9ccaa..70a3bda9555a978394356aff339af7e3870bd091 100644
Binary files a/sample_db.sqlite and b/sample_db.sqlite differ
diff --git a/templates/admin/index.html b/templates/admin/index.html
index 4a39a1ec2924c8e9edcc3585f37a2bfb4b6c4325..c361a89a482149a4901cb37a98b9ce064a88a8f9 100644
--- a/templates/admin/index.html
+++ b/templates/admin/index.html
@@ -4,7 +4,7 @@
 <div class="container">
     <div class="row">
         <div class="col-sm-10 col-sm-offset-1">
-            <h1>Digitale Methoden WiSo-Fakultät</h1>
+            <h1>Digitale Methoden WiSo-Forschungslabor</h1>
             <p class="lead">
                 Weitere Infos zum Projekt finden sich <a href="https://www.wiso.uni-hamburg.de/forschung/forschungslabor/aktuelleprojekte/digitale-methoden.html" target="_blank">hier</a>
             </p>
diff --git a/templates/export/software.jinja2 b/templates/export/software.jinja2
index 057ffef19c6453dc5b18704908b6fba6f0558ce8..e5c84a2c0016550ef9a01973dcf6aa733cc7dec9 100644
--- a/templates/export/software.jinja2
+++ b/templates/export/software.jinja2
@@ -1,12 +1,15 @@
 .Basisdaten
 |===
-| Name | {{ name }}
-| Entwickler | #developer
+| Name | {{ software.name }}
+| Kurzbeschreibung | {{software.short_description}}
+| Entwickler | {{ software.developer }}
+| Maintainer | {{ software.maintainer }}
 | Aktuelle Version | #version
-| Letzte ÄÄnderung | #lastrelease
-| Programmiersprache | #prog-language-list
+| Letzte Änderung | #lastrelease
+| Programmiersprachen | {% for prol in software.programminglanguages %}{{prol.name}} {% endfor %}
 | Betriebssystem | #os
-| Lizenz | #license
+| Lizenz | {{ software.license }}
 | Sprache | #language
-| Links | link:http://vanatteveldt.com/amcat/[Entwicklerseite]
+| Architektur | {{software.architecture}}
+| Links | {% for link in software.links %}link:{{link.url}}[{{link.type}}{{'-'+link.comment if link.comment else '' }}] {% endfor %}
 |===
\ No newline at end of file
diff --git a/templates/export/softwares.jinja2 b/templates/export/softwares.jinja2
index 7515a18bb67d78164012f75775030f37317d25bc..d96d39fbc369283aef8ef7ff41bc8e00fd5e08b4 100644
--- a/templates/export/softwares.jinja2
+++ b/templates/export/softwares.jinja2
@@ -2,6 +2,6 @@
 == {{ softwarecategory[0].name }}
 _{{softwarecategory[0].short_description}}_
 {% for software in softwarecategory[1] %}
-link:Tool_{{ software.name.replace(' ','') }}.asciidoc[{{ software.name }}] ({% for link in software.links %}link:{{link.url}}[{{link.type}}{{'-'+link.comment if link.comment else '' }}] {% endfor %}):: {{software.short_description}} < {{software.license}} | {{software.architecture}} | {% for prol in software.programminglanguages %}{{prol.name}} {% endfor %} >
+link:Tool_{{ software.name.replace(' ','') }}[{{ software.name }}] ({% for link in software.links %}link:{{link.url}}[{{link.type}}{{'-'+link.comment if link.comment else '' }}] {% endfor %}):: {{software.short_description}} < {{software.license}} | {{software.architecture}} | {% for prol in software.programminglanguages %}{{prol.name}} {% endfor %} >
 {% endfor %}
 {% endfor %}
\ No newline at end of file