a little improvements