Improvements, and added more data to the page