Adjusted again some variables

Still an issue in the duel (not taking enough space).