Bugfix and new features