small fixes + class and charts snippets