Proof-reading of chapter 1

Small corrections
Module renaming to fit GUI names