Minor changes and nitpicks