Add generics chapter & correct