Bugfixing + chimney