Wk2: Debug v2

50% code fixed + comments on each line