Small changes to a lot of places including the preamble
Finishing touch before delivering