Small adapations related to the enabling/disabling of Sammelbox during certain operations. This closes #120 and #137