Minor tweaks
Merge branch 'solution'