Renaming introduction
Misc fixes