Extend code to handle arbitrary number of generators per contact. Minor improvements here and there.