tweak a few things