more tweaks. mostly done I think.