Some updates to the data management
Merge branch 'master' of https://github.com/vincent23/lambda-alligatoren.git