Various changes and package cleaning.