Fixed Lists not being Generics.
Added some Javadocs