making additional changes ready for merge

This is the final content and it is ready for merge