bunch of misc small tweaks
Merge branch '1.2' of https://github.com/pagelines/DMS into 1.2