implementing some fixes from my wife