master
1st chapter fixes