some little improvements