added some updates, see chapters commit