Diamond content adjustments
small fixes