reorder the chapters, flesh out queries and core some more