Some improvements

:wink: