some tweaks and less core1