Added a lot of data and various changes to the templates