some small improvements..