bugfixing and chart improvements