arg checks and small adjustments