Modifier maximizer improvements

Fixes #90
Fixes #91