Reworked the order of chapters, added citations