More and more code improvements, dictionary selection