Tune the tone selection a little, refactor the library for clarity a little