some more tweakies