A few bugs fixed and more data added!