updated TODOs
accidentally merged with jpa-class branch and had to repair several files to restore javaee site