some tweakage here and there