Feature/bugfix beta

These are the bugfixes for the Bêta release.