fixing up ArrayLists for generics, also Kock curve updates