some more improvements..