Version 2 Release

Since last commit, multiple bugfixes.