bug fixes + final charts