Fixed packaging error and ambiguous comments