Fill in data details, and other small improvements