fix exception callback function... finally?
fix some design flaws
Merge branch 'feature-portal' into development