Some minor changes after 1st commit