Added listing number
Added more code comments
Merge remote-tracking branch 'origin/Tim-working'