fixed data gathering bug; created 2 types of charts