[ADD] more minor adjustments