some upgrades to core classes
Merge branch 'dev'