Changes based on supervisor comments

Small changes in all components of the paper