Tiny fixes - Part 1
Added generics discussion to Part 2