Getting ready for submission
tweaks
Updated javadocs/supress warnings