update hybrid core and a few other tweaks