various improvements..