Bugfix and stubs for new features