some tweaks and junk