a few corrections and package cleaning