#86 tiny adjustments