core improvements

some core improvements