Updated javadocs/supress warnings