add note on traits and more corrections