fixed charts, added gender column