changed some cmd line options around to be more standardized