Added javadocs & fixed rawtypes