added more data and some cosmetic changes