Some improvements

Some improvements