More minor changes before presnetation
Merge of my branch and master