Bugfixes, merge and new features