Montage fix

This one looks better. It makes some small fixes to your PR.
I've just visualized the one montage. Now that this code merges cleanly with the master branch, I can look into it a bit more.