Minor parameter comments and order changes