try to fix some things, add chart