tweaks and performance updates