Features and bugfixes from Issues

Contains all changes from Issues