core: improvements of some existing classes