fixed run away modernizer
Merge branch 'fancy0.2'
making master right