Slight improvements for carsten