Small comment and argument definition fixes