1 and 2 chapters fixes