fix generics handling and other minor edits
1 file changed