renamed a method
corrected some generic classes that were not declaring all the required generic parameters - generating compile time warnings