trying to fix some oddities.