add layered word clouds, general refactoring