improvements (layers cleaning, chart generation)