Bug fix, some experimental features