more bugs of de
Merge branch 'master' of github.com:acadien/matcalc
split ISF into categories, demarcate