More improvements from Eric Krausser <eric@krausser-edv.de>