bugfixes in sandbox