text plugin and more rivet cleanup