adjustments, fixes