core improvements