text work, general cleanup