some more improvements...