small improvoements