Initial tweaks after finishing the book