Montage fix

This one looks better. It makes some small fixes to your PR.
just wanted to makes sure I miss specific changes.