added maps and better graphs