More work on the jj return statements. Modified some of the class files.