adjustments
fixes and adjustments