Added more minor changes and commets/tidy