couple of little improvements