bunch of tiny adjustments