more tweaks and such