moved core out of include
some minor tweaks