some minor adjustments...