commit from eclipse
minor edits to supress most warnings