Fixed things; now more data!