working with tone, and cleanup