From f60c164ec1a8416e7e005869c7e40396c0edbdef Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Tue, 19 Dec 2017 12:57:25 -0600 Subject: [PATCH] Escape "<" and ">" in Javadoc when not used as HTML tag syntax --- .../jdt/JDTJava2CAstTranslator.java | 2 +- .../js/nodejs/test/NodejsRequireJsonTest.java | 2 +- ...odejsRequireTargetSelectorResolveTest.java | 2 +- .../js/nodejs/NodejsCallGraphBuilderUtil.java | 2 +- .../nodejs/NodejsRequireTargetSelector.java | 4 +- .../js/nodejs/NodejsRequiredCoreModule.java | 2 +- .../js/nodejs/NodejsRequiredSourceModule.java | 2 +- .../src/arraybounds/NotDetectable.java | 4 +- .../ContextSensitiveReachingDefs.java | 2 +- .../arraybounds/ArrayBoundsGraph.java | 8 ++-- .../arraybounds/ArrayBoundsGraphBuilder.java | 12 +++--- .../arraybounds/ConditionNormalizer.java | 2 +- .../hypergraph/DirectedHyperEdge.java | 2 +- .../hypergraph/algorithms/ShortestPath.java | 4 +- .../hypergraph/weight/NormalOrder.java | 2 +- .../hypergraph/weight/ReverseOrder.java | 2 +- .../analysis/reflection/CloneInterpreter.java | 2 +- .../reflection/FactoryBypassInterpreter.java | 2 +- .../src/com/ibm/wala/cfg/IBasicBlock.java | 4 +- .../src/com/ibm/wala/cfg/InducedCFG.java | 2 +- .../cfg/exc/ExceptionPruningAnalysis.java | 2 +- .../wala/cfg/exc/InterprocAnalysisResult.java | 2 +- .../ibm/wala/cfg/exc/NullPointerAnalysis.java | 2 +- .../ibm/wala/cfg/exc/inter/AnalysisUtil.java | 4 +- .../cfg/exc/inter/DelegatingMethodState.java | 2 +- .../inter/InterprocAnalysisResultWrapper.java | 2 +- .../cfg/exc/inter/InterprocMethodState.java | 4 +- .../inter/InterprocNullPointerAnalysis.java | 6 +-- .../cfg/exc/inter/IntraprocAnalysisState.java | 4 +- .../intra/ExplodedCFGNullPointerAnalysis.java | 2 +- .../intra/IntraprocNullPointerAnalysis.java | 2 +- .../ibm/wala/cfg/exc/intra/MethodState.java | 2 +- .../ibm/wala/cfg/exc/intra/MutableCFG.java | 2 +- .../cfg/exc/intra/NegativeGraphFilter.java | 2 +- .../cfg/exc/intra/NullPointerFrameWork.java | 2 +- .../wala/cfg/exc/intra/NullPointerSolver.java | 2 +- .../wala/cfg/exc/intra/NullPointerState.java | 6 +-- .../NullPointerTransferFunctionProvider.java | 2 +- .../wala/classLoader/ArrayClassLoader.java | 2 +- .../ibm/wala/classLoader/IClassLoader.java | 2 +- .../ibm/wala/classLoader/JarStreamModule.java | 2 +- .../ibm/wala/dataflow/IFDS/CallFlowEdges.java | 12 +++--- .../wala/dataflow/IFDS/LocalPathEdges.java | 22 +++++------ .../wala/dataflow/IFDS/LocalSummaryEdges.java | 6 +-- .../PartiallyBalancedTabulationSolver.java | 2 +- .../com/ibm/wala/dataflow/IFDS/PathEdge.java | 2 +- .../dataflow/IFDS/SingletonFlowFunction.java | 2 +- .../wala/dataflow/IFDS/TabulationResult.java | 2 +- .../wala/dataflow/IFDS/TabulationSolver.java | 38 +++++++++---------- .../demandpa/flowgraph/AbstractFlowGraph.java | 4 +- .../SimpleDemandPointerFlowGraph.java | 18 ++++----- .../demandpa/util/SimpleMemoryAccessMap.java | 4 +- .../ibm/wala/escape/FILiveObjectAnalysis.java | 2 +- .../ibm/wala/escape/ILiveObjectAnalysis.java | 12 +++--- .../wala/escape/IMethodEscapeAnalysis.java | 2 +- .../ibm/wala/escape/INodeEscapeAnalysis.java | 2 +- .../com/ibm/wala/ipa/callgraph/Context.java | 2 +- .../ipa/callgraph/impl/ExplicitCallGraph.java | 2 +- .../callgraph/impl/UnionContextSelector.java | 2 +- .../com/ibm/wala/ipa/callgraph/impl/Util.java | 2 +- .../callgraph/propagation/InstanceKey.java | 4 +- .../ipa/callgraph/propagation/PointerKey.java | 8 ++-- .../PropagationCallGraphBuilder.java | 8 ++-- .../propagation/PropagationGraph.java | 8 ++-- .../propagation/PropagationSystem.java | 4 +- .../propagation/cfa/CallerContextPair.java | 2 +- .../propagation/cfa/CallerSiteContext.java | 2 +- .../cfa/CallerSiteContextPair.java | 2 +- .../propagation/cfa/ZeroXInstanceKeys.java | 6 +-- .../rta/DelegatingExplicitCallGraph.java | 4 +- .../propagation/rta/TypeBasedHeapModel.java | 4 +- .../rta/TypeBasedPointerAnalysis.java | 2 +- .../com/ibm/wala/ipa/cha/ClassHierarchy.java | 10 ++--- .../com/ibm/wala/ipa/cha/IClassHierarchy.java | 4 +- .../wala/ipa/modref/ModRefFieldAccess.java | 2 +- .../summaries/BypassMethodTargetSelector.java | 4 +- .../ibm/wala/ipa/summaries/MethodBypass.java | 4 +- .../ibm/wala/ipa/summaries/MethodSummary.java | 2 +- .../summaries/SummarizedMethodWithNames.java | 2 +- .../ipa/summaries/VolatileMethodSummary.java | 2 +- .../ipa/summaries/XMLMethodSummaryReader.java | 2 +- .../src/com/ibm/wala/ssa/AuxiliaryCache.java | 6 +-- .../src/com/ibm/wala/ssa/DefUse.java | 6 +-- .../src/com/ibm/wala/ssa/IAuxiliaryCache.java | 2 +- .../src/com/ibm/wala/ssa/SSABuilder.java | 6 +-- .../src/com/ibm/wala/ssa/SSACFG.java | 4 +- .../src/com/ibm/wala/ssa/SSACache.java | 8 ++-- .../src/com/ibm/wala/ssa/SymbolTable.java | 4 +- .../analysis/DeadAssignmentElimination.java | 2 +- .../src/com/ibm/wala/types/Descriptor.java | 2 +- .../com/ibm/wala/types/FieldReference.java | 2 +- .../com/ibm/wala/types/MethodReference.java | 2 +- .../src/com/ibm/wala/types/TypeName.java | 4 +- .../src/com/ibm/wala/types/TypeReference.java | 4 +- .../wala/types/generics/ClassSignature.java | 2 +- .../types/generics/ClassTypeSignature.java | 2 +- .../ibm/wala/util/PrimitiveAssignability.java | 2 +- .../wala/util/bytecode/BytecodeStream.java | 2 +- .../wala/util/ssa/ClassLookupException.java | 2 +- .../com/ibm/wala/util/ssa/IInstantiator.java | 2 +- .../ibm/wala/util/ssa/ParameterAccessor.java | 8 ++-- .../src/com/ibm/wala/util/ssa/SSAValue.java | 2 +- .../ibm/wala/util/ssa/SSAValueManager.java | 2 +- .../util/ssa/TypeSafeInstructionFactory.java | 2 +- .../com/ibm/wala/util/ssa/package-info.java | 2 +- .../src/com/ibm/wala/util/strings/Atom.java | 6 +-- .../callgraph/androidModel/AndroidModel.java | 2 +- .../androidModel/AndroidModelClass.java | 2 +- .../callgraph/androidModel/IntentModel.java | 2 +- .../callgraph/androidModel/MicroModel.java | 2 +- .../ipa/callgraph/androidModel/MiniModel.java | 2 +- .../callgraph/androidModel/package-info.java | 2 +- .../AndroidModelParameterManager.java | 2 +- .../DefaultInstantiationBehavior.java | 2 +- .../parameters/FlatInstantiator.java | 2 +- .../parameters/IInstantiationBehavior.java | 2 +- .../androidModel/parameters/Instantiator.java | 2 +- .../LoadedInstantiationBehavior.java | 2 +- .../parameters/ReuseParameters.java | 2 +- .../parameters/SpecializedInstantiator.java | 2 +- .../androidModel/parameters/package-info.java | 2 +- .../structure/AbstractAndroidModel.java | 2 +- .../structure/LoopAndroidModel.java | 2 +- .../structure/LoopKillAndroidModel.java | 2 +- .../structure/SequentialAndroidModel.java | 2 +- .../structure/SingleStartAndroidModel.java | 2 +- .../androidModel/structure/package-info.java | 2 +- .../androidModel/stubs/AndroidBoot.java | 2 +- .../stubs/AndroidStartComponentTool.java | 2 +- .../androidModel/stubs/ExternalModel.java | 2 +- .../androidModel/stubs/Overrides.java | 2 +- .../stubs/SystemServiceModel.java | 2 +- .../stubs/UnknownTargetModel.java | 2 +- .../androidModel/stubs/package-info.java | 2 +- .../ipa/callgraph/impl/AndroidEntryPoint.java | 2 +- .../propagation/cfa/AndroidContext.java | 2 +- .../ipa/callgraph/propagation/cfa/Intent.java | 2 +- .../propagation/cfa/IntentContext.java | 2 +- .../cfa/IntentContextInterpreter.java | 2 +- .../cfa/IntentContextSelector.java | 2 +- .../callgraph/propagation/cfa/IntentMap.java | 2 +- .../propagation/cfa/IntentStarters.java | 2 +- .../propagation/cfa/package-info.java | 2 +- .../ibm/wala/dalvik/ssa/DexSSABuilder.java | 6 +-- .../wala/dalvik/util/AndroidComponent.java | 2 +- .../dalvik/util/AndroidEntryPointLocator.java | 2 +- .../dalvik/util/AndroidEntryPointManager.java | 2 +- .../dalvik/util/AndroidManifestXMLReader.java | 2 +- .../dalvik/util/AndroidPreFlightChecks.java | 2 +- .../dalvik/util/AndroidSettingFactory.java | 2 +- .../ibm/wala/dalvik/util/AndroidTypes.java | 2 +- .../util/androidEntryPoints/ActivityEP.java | 2 +- .../androidEntryPoints/ApplicationEP.java | 2 +- .../util/androidEntryPoints/FragmentEP.java | 2 +- .../util/androidEntryPoints/LoaderCB.java | 2 +- .../util/androidEntryPoints/LocationEP.java | 2 +- .../util/androidEntryPoints/ProviderEP.java | 2 +- .../util/androidEntryPoints/ServiceEP.java | 2 +- .../util/androidEntryPoints/package-info.java | 2 +- .../ibm/wala/dalvik/util/package-info.java | 2 +- .../org/scandroid/model/AppModelMethod.java | 2 +- .../synthmethod/SSAtoXMLVisitor.java | 2 +- .../com/ibm/wala/shrikeBT/DupInstruction.java | 2 +- .../src/com/ibm/wala/sourcepos/CRTData.java | 2 +- .../src/com/ibm/wala/sourcepos/CRTFlags.java | 2 +- .../src/com/ibm/wala/sourcepos/CRTable.java | 2 +- .../src/com/ibm/wala/sourcepos/Debug.java | 2 +- .../sourcepos/InvalidCRTDataException.java | 2 +- .../sourcepos/InvalidPositionException.java | 2 +- .../wala/sourcepos/InvalidRangeException.java | 2 +- .../sourcepos/InvalidSourceInfoException.java | 2 +- .../ibm/wala/sourcepos/MethodPositions.java | 2 +- .../src/com/ibm/wala/sourcepos/Position.java | 2 +- .../wala/sourcepos/PositionsAttribute.java | 2 +- .../src/com/ibm/wala/sourcepos/Range.java | 2 +- .../util/graph/dominators/Dominators.java | 2 +- .../graph/traverse/BoundedBFSIterator.java | 2 +- .../ibm/wala/util/heapTrace/HeapTracer.java | 8 ++-- .../wala/util/intset/IntegerUnionFind.java | 4 +- 179 files changed, 294 insertions(+), 294 deletions(-) diff --git a/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTJava2CAstTranslator.java b/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTJava2CAstTranslator.java index 9f3fbb79d..25dba509b 100644 --- a/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTJava2CAstTranslator.java +++ b/com.ibm.wala.cast.java.ecj/src/com/ibm/wala/cast/java/translator/jdt/JDTJava2CAstTranslator.java @@ -2438,7 +2438,7 @@ public abstract class JDTJava2CAstTranslator { /** * Expands the form: for ( [final] Type var: iterable ) { ... } Into something equivalent to: for ( Iterator iter = * iterable.iter(); iter.hasNext(); ) { [final] Type var = (Type) iter.next(); ... } Or, in the case of an array: for ( int idx = - * 0; i < iterable.length; i++ ) { [final] Type var = iterable[idx]; ... } Except that the expression "iterable" is only evaluate + * 0; i < iterable.length; i++ ) { [final] Type var = iterable[idx]; ... } Except that the expression "iterable" is only evaluate * once (or is it?) * * @param n diff --git a/com.ibm.wala.cast.js.nodejs.test/src/com/ibm/wala/cast/js/nodejs/test/NodejsRequireJsonTest.java b/com.ibm.wala.cast.js.nodejs.test/src/com/ibm/wala/cast/js/nodejs/test/NodejsRequireJsonTest.java index 58410888c..ffb1f7d05 100644 --- a/com.ibm.wala.cast.js.nodejs.test/src/com/ibm/wala/cast/js/nodejs/test/NodejsRequireJsonTest.java +++ b/com.ibm.wala.cast.js.nodejs.test/src/com/ibm/wala/cast/js/nodejs/test/NodejsRequireJsonTest.java @@ -22,7 +22,7 @@ import com.ibm.wala.ipa.callgraph.CallGraph; import com.ibm.wala.ipa.callgraph.propagation.PropagationCallGraphBuilder; /** - * @author Brian Pfretzschner + * @author Brian Pfretzschner <brian.pfretzschner@gmail.com> */ public class NodejsRequireJsonTest { diff --git a/com.ibm.wala.cast.js.nodejs.test/src/com/ibm/wala/cast/js/nodejs/test/NodejsRequireTargetSelectorResolveTest.java b/com.ibm.wala.cast.js.nodejs.test/src/com/ibm/wala/cast/js/nodejs/test/NodejsRequireTargetSelectorResolveTest.java index 78db42e08..22c273afb 100644 --- a/com.ibm.wala.cast.js.nodejs.test/src/com/ibm/wala/cast/js/nodejs/test/NodejsRequireTargetSelectorResolveTest.java +++ b/com.ibm.wala.cast.js.nodejs.test/src/com/ibm/wala/cast/js/nodejs/test/NodejsRequireTargetSelectorResolveTest.java @@ -22,7 +22,7 @@ import com.ibm.wala.ipa.callgraph.CallGraph; import com.ibm.wala.ipa.callgraph.propagation.PropagationCallGraphBuilder; /** - * @author Brian Pfretzschner + * @author Brian Pfretzschner <brian.pfretzschner@gmail.com> */ public class NodejsRequireTargetSelectorResolveTest { diff --git a/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsCallGraphBuilderUtil.java b/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsCallGraphBuilderUtil.java index d41042c36..75666c596 100644 --- a/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsCallGraphBuilderUtil.java +++ b/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsCallGraphBuilderUtil.java @@ -46,7 +46,7 @@ import com.ibm.wala.ssa.IRFactory; import com.ibm.wala.util.WalaException; /** - * @author Brian Pfretzschner + * @author Brian Pfretzschner <brian.pfretzschner@gmail.com> */ public class NodejsCallGraphBuilderUtil extends JSCallGraphUtil { diff --git a/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsRequireTargetSelector.java b/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsRequireTargetSelector.java index 0e8c6e4e9..0dd2c7d3b 100644 --- a/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsRequireTargetSelector.java +++ b/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsRequireTargetSelector.java @@ -51,7 +51,7 @@ import com.ibm.wala.util.ssa.ClassLookupException; * This class is used by WALA internals to resolve to what functions a call * could potentially invoke. * - * @author Brian Pfretzschner + * @author Brian Pfretzschner <brian.pfretzschner@gmail.com> */ public class NodejsRequireTargetSelector implements MethodTargetSelector { @@ -314,7 +314,7 @@ public class NodejsRequireTargetSelector implements MethodTargetSelector { * 1. let PARTS = path split(START) * 2. let I = count of PARTS - 1 * 3. let DIRS = [] - * 4. while I >= 0, + * 4. while I >= 0, * a. if PARTS[I] = "node_modules" CONTINUE * b. DIR = path join(PARTS[0 .. I] + "node_modules") * c. DIRS = DIRS + DIR diff --git a/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsRequiredCoreModule.java b/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsRequiredCoreModule.java index 97183f4cb..2b8326013 100644 --- a/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsRequiredCoreModule.java +++ b/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsRequiredCoreModule.java @@ -24,7 +24,7 @@ import com.ibm.wala.util.collections.HashSetFactory; import com.ibm.wala.util.io.TemporaryFile; /** - * @author Brian Pfretzschner + * @author Brian Pfretzschner <brian.pfretzschner@gmail.com> */ public class NodejsRequiredCoreModule extends NodejsRequiredSourceModule { diff --git a/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsRequiredSourceModule.java b/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsRequiredSourceModule.java index 4ad4c7074..34c17ece1 100644 --- a/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsRequiredSourceModule.java +++ b/com.ibm.wala.cast.js.nodejs/src/com/ibm/wala/cast/js/nodejs/NodejsRequiredSourceModule.java @@ -30,7 +30,7 @@ import com.ibm.wala.util.io.Streams; * environment. The resulting function will be named GLOBAL_PREFIX + relative * file-name. To retrieve the final function name, use getFunctioName(). * - * @author Brian Pfretzschner + * @author Brian Pfretzschner <brian.pfretzschner@gmail.com> */ public class NodejsRequiredSourceModule extends SourceFileModule { diff --git a/com.ibm.wala.core.testdata/src/arraybounds/NotDetectable.java b/com.ibm.wala.core.testdata/src/arraybounds/NotDetectable.java index 7eadd7fcd..2e5d45206 100644 --- a/com.ibm.wala.core.testdata/src/arraybounds/NotDetectable.java +++ b/com.ibm.wala.core.testdata/src/arraybounds/NotDetectable.java @@ -45,12 +45,12 @@ public class NotDetectable { } /** - * This example does not work: We know 5 > 3 and sometimes length > 5 > 3. In + * This example does not work: We know 5 > 3 and sometimes length > 5 > 3. In * case of variables this conditional relation is resolved by introducing pi * nodes. For constants pi nodes can be generated, but the pi variables will * not be used (maybe due to constant propagation?). Additionally 5 != 3, so * even if we would use pi-variables for 5, there would be no relation to 3: 0 - * -(5)-> 5, 5 -(-5)-> 0, {5,length} -(0)-> 5', 0 -(3)-> 3, 3 -(-3)-> 0 Given + * -(5)-> 5, 5 -(-5)-> 0, {5,length} -(0)-> 5', 0 -(3)-> 3, 3 -(-3)-> 0 Given * the inequality graph above, we know that 5,5',3 are larger than 0 and 5 * larger 3 and length is larger than 5', but not 5' larger than 3. Which is * not always the case in general anyway. diff --git a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/ContextSensitiveReachingDefs.java b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/ContextSensitiveReachingDefs.java index b91e5aa50..92594fb4f 100644 --- a/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/ContextSensitiveReachingDefs.java +++ b/com.ibm.wala.core.tests/src/com/ibm/wala/examples/analysis/dataflow/ContextSensitiveReachingDefs.java @@ -195,7 +195,7 @@ public class ContextSensitiveReachingDefs { * balanced since a definition in a callee used as a seed for the analysis may then reach a caller, yielding a "return" without a * corresponding "call." An alternative to this approach, used in the Reps-Horwitz-Sagiv POPL95 paper, would be to "lift" the * domain of putstatic instructions with a 0 (bottom) element, have a 0->0 transition in all transfer functions, and then seed the - * analysis with the path edge (main_entry, 0) -> (main_entry, 0). We choose the partially-balanced approach to avoid pollution of + * analysis with the path edge (main_entry, 0) -> (main_entry, 0). We choose the partially-balanced approach to avoid pollution of * the flow functions. * */ diff --git a/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ArrayBoundsGraph.java b/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ArrayBoundsGraph.java index 18305a197..be0086fad 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ArrayBoundsGraph.java +++ b/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ArrayBoundsGraph.java @@ -156,8 +156,8 @@ public class ArrayBoundsGraph extends DirectedHyperGraph { /** * Add variable as constant with value value. * - * This will create the following construct: [zero] -(value)-> [h1] -0- > - * [variable] -(-value)-> [h2] -0-> [zero]. + * This will create the following construct: [zero] -(value)-> [h1] -0- > + * [variable] -(-value)-> [h2] -0-> [zero]. * * The bidirectional linking, allows things like * @@ -214,8 +214,8 @@ public class ArrayBoundsGraph extends DirectedHyperGraph { * Adds var as source var. A source var is a variable, which can be used as * source for shortest path computation. * - * This will create the following construct: [unlimited] -> [var] -> [var] - * -(unlimited)-> [unlimited] + * This will create the following construct: [unlimited] -> [var] -> [var] + * -(unlimited)-> [unlimited] * * This is a trap door construct: if [var] is not set to 0 it will get the * value unlimited, if [var] is set to 0 it will stay 0. diff --git a/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ArrayBoundsGraphBuilder.java b/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ArrayBoundsGraphBuilder.java index 02467097e..19c10629a 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ArrayBoundsGraphBuilder.java +++ b/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ArrayBoundsGraphBuilder.java @@ -112,16 +112,16 @@ public class ArrayBoundsGraphBuilder { /** * Case 1: piRestrictor restricts the pi variable for upper/ lower bounds graph * Given this code below, we want to create a hyper edge - * {piParent, piRestrictor} --> {piVar}. + * {piParent, piRestrictor} --> {piVar}. * - * If is op in {<, >} we now, that the distance from piRestrictor to piVar - * is +-1 as ( a < b ) <==> ( a <= b - 1), same with "<". + * If is op in {<, >} we now, that the distance from piRestrictor to piVar + * is +-1 as ( a < b ) <==> ( a <= b - 1), same with "<". * To be more precise we introduce a helper node and add - * {piRestrictor} -- (-)1 --> {helper} - * {piParent, helper} --> {piVar} + * {piRestrictor} -- (-)1 --> {helper} + * {piParent, helper} --> {piVar} * * Case 2: no restriction is given by the branch (i.e. the operator is not equal) - * {piParent} --> {piVar} + * {piParent} --> {piVar} * * if (piParent op piRestrictor) {piVar = piParent} * diff --git a/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ConditionNormalizer.java b/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ConditionNormalizer.java index 37a2642ab..c3df28525 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ConditionNormalizer.java +++ b/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/ConditionNormalizer.java @@ -22,7 +22,7 @@ public class ConditionNormalizer { * hand side of the comparison, also if the branch is not taken, the * operation needs to be negated. * - * p.a. the condition is !(rhs >= lhs), it will be normalized to lhs > rhs + * p.a. the condition is !(rhs >= lhs), it will be normalized to lhs > rhs * * @param cnd * condition to normalize diff --git a/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/DirectedHyperEdge.java b/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/DirectedHyperEdge.java index a0dd4aaac..e43668ffc 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/DirectedHyperEdge.java +++ b/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/DirectedHyperEdge.java @@ -11,7 +11,7 @@ import com.ibm.wala.analysis.arraybounds.hypergraph.weight.edgeweights.EdgeWeigh * @author Stephan Gocht {@code } * * @param - * Type used in HyperNodes (HyperNode) + * Type used in HyperNodes (HyperNode<T>) */ public class DirectedHyperEdge { /** Contains all destinations of this HyperEdge */ diff --git a/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/algorithms/ShortestPath.java b/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/algorithms/ShortestPath.java index 5ed3b2247..c6dca59c8 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/algorithms/ShortestPath.java +++ b/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/algorithms/ShortestPath.java @@ -172,8 +172,8 @@ public class ShortestPath { * * 
    * (n1, n2)->(n3)
-   * Round 1: n1 = unset, n2 = -3 -> n3 = max(unset,-3) = -3
-   * Round 2: n1 = 1, n2 = -3 -> n3 = max(1,-3) = 1
+   * Round 1: n1 = unset, n2 = -3 -> n3 = max(unset,-3) = -3
+   * Round 2: n1 = 1, n2 = -3 -> n3 = max(1,-3) = 1
    *
* * Would we compute the minimum of n3 over all rounds, it would be -3, but 1 diff --git a/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/NormalOrder.java b/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/NormalOrder.java index e07e3fabc..504eabb07 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/NormalOrder.java +++ b/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/NormalOrder.java @@ -5,7 +5,7 @@ import java.util.Comparator; import com.ibm.wala.analysis.arraybounds.hypergraph.weight.Weight.Type; /** - * Defines a normal Order on Weight: unlimited < ... < -1 < 0 < 1 < ... not_set + * Defines a normal Order on Weight: unlimited < ... < -1 < 0 < 1 < ... not_set * is not comparable * * @author Stephan Gocht {@code } diff --git a/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/ReverseOrder.java b/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/ReverseOrder.java index 72c9397cc..0bddefbe3 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/ReverseOrder.java +++ b/com.ibm.wala.core/src/com/ibm/wala/analysis/arraybounds/hypergraph/weight/ReverseOrder.java @@ -5,7 +5,7 @@ import java.util.Comparator; import com.ibm.wala.analysis.arraybounds.hypergraph.weight.Weight.Type; /** - * Defines a reverse Order on Weight: ... > 1 > 0 > -1 > ... > unlimited not_set + * Defines a reverse Order on Weight: ... > 1 > 0 > -1 > ... > unlimited not_set * is not comparable * * @author Stephan Gocht {@code } diff --git a/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/CloneInterpreter.java b/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/CloneInterpreter.java index d92bb0228..00a8ce4e7 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/CloneInterpreter.java +++ b/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/CloneInterpreter.java @@ -94,7 +94,7 @@ public class CloneInterpreter implements SSAContextInterpreter { private final static int NEW_PC = 0; /** - * Mapping from TypeReference -> IR TODO: Soft references? + * Mapping from TypeReference -> IR TODO: Soft references? */ final private Map IRCache = HashMapFactory.make(); diff --git a/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/FactoryBypassInterpreter.java b/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/FactoryBypassInterpreter.java index aeaca10bf..6446e2f96 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/FactoryBypassInterpreter.java +++ b/com.ibm.wala.core/src/com/ibm/wala/analysis/reflection/FactoryBypassInterpreter.java @@ -67,7 +67,7 @@ import com.ibm.wala.util.warnings.Warnings; public class FactoryBypassInterpreter extends AbstractReflectionInterpreter { /** - * A Map from CallerSiteContext -> Set represents the types a factory method might create in a particular context + * A Map from CallerSiteContext -> Set <TypeReference>represents the types a factory method might create in a particular context */ private final Map> map = HashMapFactory.make(); diff --git a/com.ibm.wala.core/src/com/ibm/wala/cfg/IBasicBlock.java b/com.ibm.wala.core/src/com/ibm/wala/cfg/IBasicBlock.java index a5b9bddbf..a009c1cf4 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/cfg/IBasicBlock.java +++ b/com.ibm.wala.core/src/com/ibm/wala/cfg/IBasicBlock.java @@ -24,7 +24,7 @@ public interface IBasicBlock extends INodeWithNumber, Iterable extends INodeWithNumber, Iterable BasicBlock + * A partial map from Instruction -> BasicBlock */ private final BasicBlock[] i2block; diff --git a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/ExceptionPruningAnalysis.java b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/ExceptionPruningAnalysis.java index 17856b740..8f2ef6f90 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/ExceptionPruningAnalysis.java +++ b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/ExceptionPruningAnalysis.java @@ -23,7 +23,7 @@ import com.ibm.wala.util.graph.GraphIntegrity.UnsoundGraphException; * control flow from a CFG. This is done by detecting exceptions that may always * (or never) appear. * - * @author Juergen Graf + * @author Juergen Graf <graf@kit.edu> * */ public interface ExceptionPruningAnalysis> { diff --git a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/InterprocAnalysisResult.java b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/InterprocAnalysisResult.java index b3802b3e0..b89a2b363 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/InterprocAnalysisResult.java +++ b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/InterprocAnalysisResult.java @@ -17,7 +17,7 @@ import com.ibm.wala.ipa.callgraph.CGNode; /** * Interface to retrieve the result of the interprocedural analysis. * - * @author Juergen Graf + * @author Juergen Graf <graf@kit.edu> */ public interface InterprocAnalysisResult> { diff --git a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/NullPointerAnalysis.java b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/NullPointerAnalysis.java index 65eadb79d..09506e455 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/NullPointerAnalysis.java +++ b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/NullPointerAnalysis.java @@ -31,7 +31,7 @@ import com.ibm.wala.util.graph.GraphIntegrity.UnsoundGraphException; * Tries to detect impossible (or always appearing) NullPointerExceptions and removes impossible * control flow from the CFG. * - * @author Juergen Graf + * @author Juergen Graf <graf@kit.edu> * */ public final class NullPointerAnalysis { diff --git a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/AnalysisUtil.java b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/AnalysisUtil.java index 407ed654d..dbf9896c7 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/AnalysisUtil.java +++ b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/AnalysisUtil.java @@ -27,8 +27,8 @@ import com.ibm.wala.ssa.analysis.IExplodedBasicBlock; * This class has been developed as part of a student project "Studienarbeit" by Markus Herhoffer. * It has been adapted and integrated into the WALA project by Juergen Graf. * - * @author Markus Herhoffer - * @author Juergen Graf + * @author Markus Herhoffer <markus.herhoffer@student.kit.edu> + * @author Juergen Graf <graf@kit.edu> */ public final class AnalysisUtil { diff --git a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/DelegatingMethodState.java b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/DelegatingMethodState.java index 35856f005..a2c855472 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/DelegatingMethodState.java +++ b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/DelegatingMethodState.java @@ -19,7 +19,7 @@ import com.ibm.wala.ssa.SSAAbstractInvokeInstruction; * This class combines two MethodState objects. A MethodState decides if a given method call may throw an exception. * If the primary MethodState thinks that the call may throw an exception, the fallback MethodState is asked. * - * @author Juergen Graf + * @author Juergen Graf <graf@kit.edu> * */ class DelegatingMethodState extends MethodState { diff --git a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/InterprocAnalysisResultWrapper.java b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/InterprocAnalysisResultWrapper.java index e703406b3..98b20f157 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/InterprocAnalysisResultWrapper.java +++ b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/InterprocAnalysisResultWrapper.java @@ -23,7 +23,7 @@ import com.ibm.wala.ssa.analysis.IExplodedBasicBlock; /** * A wrapper for the interprocedural analysis result. * - * @author Juergen Graf + * @author Juergen Graf <graf@kit.edu> * */ class InterprocAnalysisResultWrapper implements InterprocAnalysisResult { diff --git a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/InterprocMethodState.java b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/InterprocMethodState.java index f0ded3e12..534abb4b3 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/InterprocMethodState.java +++ b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/InterprocMethodState.java @@ -24,8 +24,8 @@ import com.ibm.wala.ssa.SSAAbstractInvokeInstruction; * This class has been developed as part of a student project "Studienarbeit" by Markus Herhoffer. * It has been adapted and integrated into the WALA project by Juergen Graf. * - * @author Markus Herhoffer - * @author Juergen Graf + * @author Markus Herhoffer <markus.herhoffer@student.kit.edu> + * @author Juergen Graf <graf@kit.edu> * */ class InterprocMethodState extends MethodState { diff --git a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/InterprocNullPointerAnalysis.java b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/InterprocNullPointerAnalysis.java index 1cc89d0df..0a54a5a87 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/InterprocNullPointerAnalysis.java +++ b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/InterprocNullPointerAnalysis.java @@ -54,8 +54,8 @@ import com.ibm.wala.util.strings.Atom; * This class has been developed as part of a student project "Studienarbeit" by Markus Herhoffer. * It has been adapted and integrated into the WALA project by Juergen Graf. * - * @author Markus Herhoffer - * @author Juergen Graf + * @author Markus Herhoffer <markus.herhoffer@student.kit.edu> + * @author Juergen Graf <graf@kit.edu> * */ public final class InterprocNullPointerAnalysis { @@ -230,7 +230,7 @@ public final class InterprocNullPointerAnalysis { /** * Filter for CallGraphs * - * @author Markus Herhoffer + * @author Markus Herhoffer <markus.herhoffer@student.kit.edu> * */ private static class CallGraphFilter { diff --git a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/IntraprocAnalysisState.java b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/IntraprocAnalysisState.java index 4dfb90a7b..e19553dba 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/IntraprocAnalysisState.java +++ b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/inter/IntraprocAnalysisState.java @@ -31,8 +31,8 @@ import com.ibm.wala.util.graph.GraphIntegrity.UnsoundGraphException; * This class has been developed as part of a student project "Studienarbeit" by Markus Herhoffer. * It has been adapted and integrated into the WALA project by Juergen Graf. * - * @author Markus Herhoffer - * @author Juergen Graf + * @author Markus Herhoffer <markus.herhoffer@student.kit.edu> + * @author Juergen Graf <graf@kit.edu> * */ final class IntraprocAnalysisState implements ExceptionPruningAnalysis { diff --git a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/ExplodedCFGNullPointerAnalysis.java b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/ExplodedCFGNullPointerAnalysis.java index 8e6e1eccb..65bad8618 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/ExplodedCFGNullPointerAnalysis.java +++ b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/ExplodedCFGNullPointerAnalysis.java @@ -27,7 +27,7 @@ import com.ibm.wala.util.graph.GraphIntegrity.UnsoundGraphException; /** * Intraprocedural null pointer analysis for the exploded control flow graph. * - * @author Juergen Graf + * @author Juergen Graf <graf@kit.edu> * */ public class ExplodedCFGNullPointerAnalysis implements ExceptionPruningAnalysis { diff --git a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/IntraprocNullPointerAnalysis.java b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/IntraprocNullPointerAnalysis.java index a316828b2..ab9a56d51 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/IntraprocNullPointerAnalysis.java +++ b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/IntraprocNullPointerAnalysis.java @@ -57,7 +57,7 @@ import com.ibm.wala.util.graph.impl.SparseNumberedGraph; /** * Intraprocedural dataflow analysis to detect impossible NullPointerExceptions. * - * @author Juergen Graf + * @author Juergen Graf <graf@kit.edu> * */ public class IntraprocNullPointerAnalysis { diff --git a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/MethodState.java b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/MethodState.java index 9b2afbea8..4d864d8e7 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/MethodState.java +++ b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/MethodState.java @@ -17,7 +17,7 @@ import com.ibm.wala.ssa.SSAAbstractInvokeInstruction; * Provides a way for the nullpointer analysis to decide whether or not a called method * may throw an exception. * - * @author Juergen Graf + * @author Juergen Graf <graf@kit.edu> * */ public abstract class MethodState { diff --git a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/MutableCFG.java b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/MutableCFG.java index cf4132e01..b2f284fe4 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/MutableCFG.java +++ b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/MutableCFG.java @@ -26,7 +26,7 @@ import com.ibm.wala.util.intset.IntSet; /** * A modifiable control flow graph. * - * @author Juergen Graf + * @author Juergen Graf <graf@kit.edu> * */ public class MutableCFG> extends SparseNumberedGraph implements ControlFlowGraph { diff --git a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NegativeGraphFilter.java b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NegativeGraphFilter.java index 6c8e50d19..3eb481c77 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NegativeGraphFilter.java +++ b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NegativeGraphFilter.java @@ -19,7 +19,7 @@ import com.ibm.wala.util.graph.Graph; * An EdgeFilter that ignores all edges contained in a given graph. This ca be used * to subtract a subgraph from its main graph. * - * @author Juergen Graf + * @author Juergen Graf <graf@kit.edu> * */ public class NegativeGraphFilter> implements EdgeFilter { diff --git a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerFrameWork.java b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerFrameWork.java index 2eccb72b9..be99fd83e 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerFrameWork.java +++ b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerFrameWork.java @@ -26,7 +26,7 @@ import com.ibm.wala.util.intset.IntPair; * functions are not distribute (similar to constant propagation). Therefore we remove * back edges in the flow graph. * - * @author Juergen Graf + * @author Juergen Graf <graf@kit.edu> * */ public class NullPointerFrameWork implements IKilldallFramework { diff --git a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerSolver.java b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerSolver.java index e31e0bff7..fa826f020 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerSolver.java +++ b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerSolver.java @@ -18,7 +18,7 @@ import com.ibm.wala.ssa.ISSABasicBlock; /** * Intraprocedural dataflow analysis to detect impossible NullPointerExceptions. * - * @author Juergen Graf + * @author Juergen Graf <graf@kit.edu> * */ public class NullPointerSolver extends DataflowSolver { diff --git a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerState.java b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerState.java index a06c86708..d46088889 100644 --- a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerState.java +++ b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerState.java @@ -22,7 +22,7 @@ import com.ibm.wala.ssa.SymbolTable; /** * States for the ssa variables. * - * @author Juergen Graf + * @author Juergen Graf <graf@kit.edu> * */ public class NullPointerState extends AbstractVariable { @@ -76,7 +76,7 @@ public class NullPointerState extends AbstractVariable { * 
    * v3 = phi v1, v2
    * ^ := Meet-operator
-   * f := phiValueMeetFunction(3, {1, 2}) = v1,v2,v3 -> v1,v2,[v1 ^ v2]
+   * f := phiValueMeetFunction(3, {1, 2}) = v1,v2,v3 -> v1,v2,[v1 ^ v2]
    * 
    * f(1,?,?) ^ f(?,1,?) = 1,?,? ^ ?,1,? = 1,1,?
    * 
@@ -134,7 +134,7 @@ public class NullPointerState extends AbstractVariable {
    * 
    * ? == unknown, 1 == not null, 0 == null, * == both
    * 
-   * meet | ? | 0 | 1 | * |  <- rhs
+   * meet | ? | 0 | 1 | * |  <- rhs
    * -----|---|---|---|---|
    *    ? | ? | 0 | 1 | * |
    * -----|---|---|---|---|
diff --git a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerTransferFunctionProvider.java b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerTransferFunctionProvider.java
index 59284af38..419091fe5 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerTransferFunctionProvider.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/cfg/exc/intra/NullPointerTransferFunctionProvider.java
@@ -51,7 +51,7 @@ import com.ibm.wala.ssa.analysis.IExplodedBasicBlock;
 import com.ibm.wala.util.collections.Iterator2Iterable;
 
 /**
- * @author Juergen Graf 
+ * @author Juergen Graf <graf@kit.edu>
  *
  */
 class NullPointerTransferFunctionProvider implements ITransferFunctionProvider {
diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ArrayClassLoader.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ArrayClassLoader.java
index 1ace8aad6..1c58f9c1a 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/ArrayClassLoader.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/ArrayClassLoader.java
@@ -26,7 +26,7 @@ public class ArrayClassLoader {
   private final static boolean DEBUG = false;
 
   /**
-   * map: TypeReference -> ArrayClass
+   * map: TypeReference -> ArrayClass
    */
   final private HashMap arrayClasses = HashMapFactory.make();
 
diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/IClassLoader.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/IClassLoader.java
index b6ae10f8b..a51fcaaf0 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/IClassLoader.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/IClassLoader.java
@@ -122,7 +122,7 @@ public interface IClassLoader {
   /**
    * blow away references to any classes in the set
    * 
-   * @param toRemove Collection
+   * @param toRemove Collection<IClass>
    */
   public abstract void removeAll(Collection toRemove);
 }
diff --git a/com.ibm.wala.core/src/com/ibm/wala/classLoader/JarStreamModule.java b/com.ibm.wala.core/src/com/ibm/wala/classLoader/JarStreamModule.java
index bfff0afab..062f44b6a 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/classLoader/JarStreamModule.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/classLoader/JarStreamModule.java
@@ -29,7 +29,7 @@ import com.ibm.wala.util.warnings.Warnings;
 /**
  * Read in a jar file from an input stream. Most parts are copied from the NestedJarFileModule class
  * and adapted to work with an input stream. 
- * @author Juergen Graf 
+ * @author Juergen Graf <juergen.graf@gmail.com>
  */
 public class JarStreamModule extends JarInputStream implements Module {
 
diff --git a/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/CallFlowEdges.java b/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/CallFlowEdges.java
index ed8d009da..39bd1a0ba 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/CallFlowEdges.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/CallFlowEdges.java
@@ -25,11 +25,11 @@ import com.ibm.wala.util.intset.SparseIntSet;
 public class CallFlowEdges {
 
   /**
-   * A map from integer -> (IBinaryNonNegativeIntRelation)
+   * A map from integer -> (IBinaryNonNegativeIntRelation)
    * 
-   * For a fact d2, edges[d2] gives a relation R=(c,d1) s.t. ( -> ) was recorded as a call flow edge.
+   * For a fact d2, edges[d2] gives a relation R=(c,d1) s.t. (<c, d1> -> <s_p,d2>) was recorded as a call flow edge.
    * 
-   * Note that we handle paths of the form  ->  specially, below.
+   * Note that we handle paths of the form <c, d1> -> <s_p,d1> specially, below.
    * 
    * TODO: more representation optimization. A special representation for triples? sparse representations for CFG? exploit shorts
    * for ints?
@@ -37,9 +37,9 @@ public class CallFlowEdges {
   private final SparseVector edges = new SparseVector<>(1, 1.1f);
 
   /**
-   * a map from integer d1 -> int set.
+   * a map from integer d1 -> int set.
    * 
-   * for fact d1, identityPaths[d1] gives the set of block numbers C s.t. for c \in C,  ->  is an edge.
+   * for fact d1, identityPaths[d1] gives the set of block numbers C s.t. for c \in C, <c, d1> -> <s_p, d1> is an edge.
    */
   private final SparseVector identityEdges = new SparseVector<>(1, 1.1f);
 
@@ -47,7 +47,7 @@ public class CallFlowEdges {
   }
 
   /**
-   * Record that we've discovered a call edge  -> 
+   * Record that we've discovered a call edge <c,d1> -> <s_p, d2>
    * 
    * @param c global number identifying the call site node
    * @param d1 source fact at the call edge
diff --git a/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/LocalPathEdges.java b/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/LocalPathEdges.java
index b6701113a..45286d046 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/LocalPathEdges.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/LocalPathEdges.java
@@ -33,11 +33,11 @@ public class LocalPathEdges {
   private final static boolean PARANOID = false;
 
   /**
-   * A map from integer (d2) -> (IBinaryNonNegativeIntRelation)
+   * A map from integer (d2) -> (IBinaryNonNegativeIntRelation)
    * 
-   * For fact d2, paths[d2] gives a relation R=(n,d1) s.t. ( -> ) is a path edge.
+   * For fact d2, paths[d2] gives a relation R=(n,d1) s.t. (<s_p, d1> -> <n,d2>) is a path edge.
    * 
-   * Note that we handle paths of the form  ->  specially, below. We also handle paths of the form  ->  specially below.
    * 
    * We choose this somewhat convoluted representation for the following reasons: 1) of the (n, d1, d2) tuple-space, we expect the
@@ -58,9 +58,9 @@ public class LocalPathEdges {
    * space or time of the non-merging IFDS solver, for which the original paths representation works well. Is there a better data
    * structure tradeoff?
    * 
-   * A map from integer (d1) -> (IBinaryNonNegativeIntRelation)
+   * A map from integer (d1) -> (IBinaryNonNegativeIntRelation)
    * 
-   * For fact d1, paths[d1] gives a relation R=(n,d2) s.t. ( -> ) is a path edge.
+   * For fact d1, paths[d1] gives a relation R=(n,d2) s.t. (<s_p, d1> -> <n,d2>) is a path edge.
    * 
    * 
    * We choose this somewhat convoluted representation for the following reasons: 1) of the (n, d1, d2) tuple-space, we expect the
@@ -71,16 +71,16 @@ public class LocalPathEdges {
   private final SparseVector altPaths;
 
   /**
-   * a map from integer d1 -> int set.
+   * a map from integer d1 -> int set.
    * 
-   * for fact d1, identityPaths[d1] gives the set of block numbers N s.t. for n \in N,  ->  is a path edge.
+   * for fact d1, identityPaths[d1] gives the set of block numbers N s.t. for n \in N, <s_p, d1> -> <n, d1> is a path edge.
    */
   private final SparseVector identityPaths = new SparseVector<>(1, 1.1f);
 
   /**
-   * a map from integer d2 -> int set
+   * a map from integer d2 -> int set
    * 
-   * for fact d2, zeroPaths[d2] gives the set of block numbers N s.t. for n \in N,  ->  is a path edge.
+   * for fact d2, zeroPaths[d2] gives the set of block numbers N s.t. for n \in N, <s_p, 0> -> <n, d2> is a path edge.
    */
   private final SparseVector zeroPaths = new SparseVector<>(1, 1.1f);
 
@@ -193,8 +193,8 @@ public class LocalPathEdges {
   }
 
   /**
-   * N.B: If we're using the ZERO_PATH_SHORT_CIRCUIT, then we may have  ->  implicitly represented since we also
-   * have  -> . However, getInverse()  will NOT  return these implicit d1 bits in the result. This translates
+   * N.B: If we're using the ZERO_PATH_SHORT_CIRCUIT, then we may have <s_p, d1> -> <n, d2> implicitly represented since we also
+   * have <s_p, 0> -> <n,d2>. However, getInverse() <b> will NOT </b> return these implicit d1 bits in the result. This translates
    * to saying that the caller had better not care about any other d1 other than d1==0 if d1==0 is present. This happens to be true
    * in the single use of getInverse() in the tabulation solver, which uses getInverse() to propagate flow from an exit node back to
    * the caller's return site(s). Since we know that we will see flow from fact 0 to the return sites(s), we don't care about other
diff --git a/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/LocalSummaryEdges.java b/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/LocalSummaryEdges.java
index 123f04210..ace18309f 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/LocalSummaryEdges.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/LocalSummaryEdges.java
@@ -25,10 +25,10 @@ import com.ibm.wala.util.math.LongUtil;
 public class LocalSummaryEdges {
 
   /**
-   * A map from integer n -> (IBinaryNonNegativeIntRelation)
+   * A map from integer n -> (IBinaryNonNegativeIntRelation)
    * 
    * Let s_p be an entry to this procedure, and x be an exit. n is a integer which uniquely identifies an (s_p,x) relation. For any
-   * such n, summaries[n] gives a relation R=(d1,d2) s.t. ( -> ) is a summary edge.
+   * such n, summaries[n] gives a relation R=(d1,d2) s.t. (<s_p, d1> -> <x,d2>) is a summary edge.
    * 
    * Note that this representation is a little different from the representation described in the PoPL 95 paper. We cache summary
    * edges at the CALLEE, not at the CALLER!!! This allows us to avoid eagerly installing summary edges at all call sites to a
@@ -61,7 +61,7 @@ public class LocalSummaryEdges {
   }
 
   /**
-   * Record a summary edge for the flow d1 -> d2 from an entry s_p to an exit x.
+   * Record a summary edge for the flow d1 -> d2 from an entry s_p to an exit x.
    * 
    * @param s_p local block number an entry
    * @param x local block number of an exit block
diff --git a/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/PartiallyBalancedTabulationSolver.java b/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/PartiallyBalancedTabulationSolver.java
index b24cc1642..01cef3538 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/PartiallyBalancedTabulationSolver.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/PartiallyBalancedTabulationSolver.java
@@ -89,7 +89,7 @@ public class PartiallyBalancedTabulationSolver extends TabulationSolver
   }
 
   /**
-   * A path edge  ->  was propagated, and  was an unbalanced seed.
+   * A path edge <s_p, i> -> <n, j> was propagated, and <s_p, i> was an unbalanced seed.
    * So, we added a new seed callerSeed (to some return site) in the caller.  To be overridden
    * in subclasses.
    */
diff --git a/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/PathEdge.java b/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/PathEdge.java
index 199fe81bf..4db0dfe6c 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/PathEdge.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/PathEdge.java
@@ -12,7 +12,7 @@ package com.ibm.wala.dataflow.IFDS;
 
 
 /**
- * an individual edge  -> 
+ * an individual edge <entry, d1> -> <target, d2>
  * 
  * @param  node type in the supergraph
  */
diff --git a/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/SingletonFlowFunction.java b/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/SingletonFlowFunction.java
index 0a602b2bf..0c07d2af0 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/SingletonFlowFunction.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/SingletonFlowFunction.java
@@ -13,7 +13,7 @@ package com.ibm.wala.dataflow.IFDS;
 import com.ibm.wala.util.intset.SparseIntSet;
 
 /**
- * A flow function which has only the edge 0 -> dest
+ * A flow function which has only the edge 0 -> dest
  */
 public class SingletonFlowFunction implements IReversibleFlowFunction {
 
diff --git a/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationResult.java b/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationResult.java
index 2c162d214..7fbb8ebb7 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationResult.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationResult.java
@@ -15,7 +15,7 @@ import java.util.Collection;
 import com.ibm.wala.util.intset.IntSet;
 
 /**
- * The solution of a tabulation problem: a mapping from supergraph node -> bit vector representing the dataflow facts that hold at
+ * The solution of a tabulation problem: a mapping from supergraph node -> bit vector representing the dataflow facts that hold at
  * the entry to the supergraph node.
  * 
  * @param  type of node in the supergraph
diff --git a/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationSolver.java b/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationSolver.java
index 6a3dad199..8c43230ea 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationSolver.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/dataflow/IFDS/TabulationSolver.java
@@ -110,23 +110,23 @@ public class TabulationSolver {
   private final TabulationProblem problem;
 
   /**
-   * A map from Object (entry node in supergraph) -> LocalPathEdges.
+   * A map from Object (entry node in supergraph) -> LocalPathEdges.
    *
-   * Logically, this represents a set of edges (s_p,d_i) -> (n, d_j). The data structure is chosen to attempt to save space over
+   * Logically, this represents a set of edges (s_p,d_i) -> (n, d_j). The data structure is chosen to attempt to save space over
    * representing each edge explicitly.
    */
   final private Map pathEdges = HashMapFactory.make();
 
   /**
-   * A map from Object (entry node in supergraph) -> CallFlowEdges.
+   * A map from Object (entry node in supergraph) -> CallFlowEdges.
    *
-   * Logically, this represents a set of edges (c,d_i) -> (s_p, d_j). The data structure is chosen to attempt to save space over
+   * Logically, this represents a set of edges (c,d_i) -> (s_p, d_j). The data structure is chosen to attempt to save space over
    * representing each edge explicitly.
    */
   final private Map callFlowEdges = HashMapFactory.make();
 
   /**
-   * A map from Object (procedure) -> LocalSummaryEdges.
+   * A map from Object (procedure) -> LocalSummaryEdges.
    *
    */
   final protected Map summaryEdges = HashMapFactory.make();
@@ -754,7 +754,7 @@ public class TabulationSolver {
   }
 
   /**
-   * Propagate the fact  ->  has arisen as a path edge. Returns true iff the path edge was not previously
+   * Propagate the fact <s_p,i> -> <n, j> has arisen as a path edge. Returns <code>true</code> iff the path edge was not previously
    * observed.
    *
    * @param s_p entry block
@@ -791,10 +791,10 @@ public class TabulationSolver {
   }
 
   /**
-   * Merging: suppose we're doing propagate  ->  but we already have path edges  -> ,  -> , and
-   *  ->.
+   * Merging: suppose we're doing propagate <s_p,i> -> <n,j> but we already have path edges <s_p,i> -> <n, x>, <s_p,i> -> <n,y>, and
+   * <s_p,i> -><n, z>.
    *
-   * let \alpha be the merge function. then instead of  -> , we propagate  ->  !!!
+   * let \alpha be the merge function. then instead of <s_p,i> -> <n,j>, we propagate <s_p,i> -> <n, \alpha(j,x,y,z) > !!!
    *
    * return -1 if no fact should be propagated
    */
@@ -1042,9 +1042,9 @@ public class TabulationSolver {
   }
 
   /**
-   * Indicates that due to a path edge  ->  (the 'edge'
-   * parameter) and a normal flow function application, a new path edge  ->  was created. To be overridden in subclasses. We also use
+   * Indicates that due to a path edge <s_p, d1> -> <n, d2> (the 'edge'
+   * parameter) and a normal flow function application, a new path edge <s_p,
+   * d1> -> <m, d3> was created. To be overridden in subclasses. We also use
    * this function to record call-to-return flow.
    *
    */
@@ -1054,9 +1054,9 @@ public class TabulationSolver {
   }
 
   /**
-   * Indicates that due to a path edge 'edge'  ->  and
-   * application of a call flow function, a new path edge  ->
-   *  was created. To be overridden in subclasses.
+   * Indicates that due to a path edge 'edge' <s_p, d1> -> <n, d2> and
+   * application of a call flow function, a new path edge <calleeEntry, d3> ->
+   * <calleeEntry, d3> was created. To be overridden in subclasses.
    *
    */
   @SuppressWarnings("unused")
@@ -1066,10 +1066,10 @@ public class TabulationSolver {
 
   /**
    * Combines [25] and [26-28]. In the caller we have a path edge
-   * 'edgeToCallSite'  -> , where c is the call site. In the
-   * callee, we have path edge 'calleeSummaryEdge'  -> . Of
-   * course, there is a call edge  -> . Finally, we have a
-   * return edge  -> .
+   * 'edgeToCallSite' <s_c, d3> -> <c, d4>, where c is the call site. In the
+   * callee, we have path edge 'calleeSummaryEdge' <s_p, d1> -> <e_p, d2>. Of
+   * course, there is a call edge <c, d4> -> <s_p, d1>. Finally, we have a
+   * return edge <e_p, d2> -> <returnSite, d5>.
    */
   @SuppressWarnings("unused")
   protected void newSummaryEdge(PathEdge edgeToCallSite, PathEdge calleeSummaryEdge, T returnSite, int d5) {
diff --git a/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/AbstractFlowGraph.java b/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/AbstractFlowGraph.java
index 5cd0e54d9..2b4314f60 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/AbstractFlowGraph.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/AbstractFlowGraph.java
@@ -114,7 +114,7 @@ public abstract class AbstractFlowGraph extends SlowSparseNumberedLabeledGraph SSAInvokeInstruction. If we have (x, foo()), that means that x was def'fed by the return value from the
+   * Map: LocalPointerKey -> SSAInvokeInstruction. If we have (x, foo()), that means that x was def'fed by the return value from the
    * call to foo()
    */
   protected final Map callDefs = HashMapFactory.make();
@@ -127,7 +127,7 @@ public abstract class AbstractFlowGraph extends SlowSparseNumberedLabeledGraph> callParams = HashMapFactory.make();
 
   /**
-   * Map: LocalPointerKey -> CGNode. If we have (x, foo), then x is a parameter of method foo. For now, we have to re-discover the
+   * Map: LocalPointerKey -> CGNode. If we have (x, foo), then x is a parameter of method foo. For now, we have to re-discover the
    * parameter position. TODO this should just be a set; we can get the CGNode from the {@link LocalPointerKey}
    */
   protected final Map params = HashMapFactory.make();
diff --git a/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/SimpleDemandPointerFlowGraph.java b/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/SimpleDemandPointerFlowGraph.java
index ff059b903..475716081 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/SimpleDemandPointerFlowGraph.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/demandpa/flowgraph/SimpleDemandPointerFlowGraph.java
@@ -81,13 +81,13 @@ import com.ibm.wala.util.ref.ReferenceCleanser;
  * 
  * The edges represent
  * 
    
- * 
  • flow from local -> local representing assignment (i.e. phi,pi)
- * 
  • flow from instancekey -> local for news
- * 
  • flow from formal -> actual parameter
- * 
  • flow from return value -> local
+ * 
  • flow from local -> local representing assignment (i.e. phi,pi)
+ * 
  • flow from instancekey -> local for news
+ * 
  • flow from formal -> actual parameter
+ * 
  • flow from return value -> local
  * 
  • match edges
- * 
  • local -> local edges representing loads/stores (e.g. x = y.f will have a edge x->y, labelled with f) for a getstatic x = Y.f,
- * we have an edge from x -> Y.f.
+ * 
  • local -> local edges representing loads/stores (e.g. x = y.f will have a edge x->y, labelled with f) for a getstatic x = Y.f,
+ * we have an edge from x -> Y.f.
  * 

  * 
  * N.B: Edges go OPPOSITE the flow of values.
@@ -119,20 +119,20 @@ public class SimpleDemandPointerFlowGraph extends SlowSparseNumberedGraph IField. if we have (x,f), that means x was def'fed by a getfield on f.
+   * Map: LocalPointerKey -> IField. if we have (x,f), that means x was def'fed by a getfield on f.
    */
   final Map getFieldDefs = HashMapFactory.make();
 
   final Collection arrayDefs = HashSetFactory.make();
 
   /**
-   * Map: LocalPointerKey -> SSAInvokeInstruction. If we have (x, foo()), that means that x was def'fed by the return value from a
+   * Map: LocalPointerKey -> SSAInvokeInstruction. If we have (x, foo()), that means that x was def'fed by the return value from a
    * call to foo()
    */
   final Map callDefs = HashMapFactory.make();
 
   /**
-   * Map: LocalPointerKey -> CGNode. If we have (x, foo), then x is a parameter of method foo. For now, we have to re-discover the
+   * Map: LocalPointerKey -> CGNode. If we have (x, foo), then x is a parameter of method foo. For now, we have to re-discover the
    * parameter position.
    */
   final Map params = HashMapFactory.make();
diff --git a/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/SimpleMemoryAccessMap.java b/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/SimpleMemoryAccessMap.java
index 36b570f71..2198d3630 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/SimpleMemoryAccessMap.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/demandpa/util/SimpleMemoryAccessMap.java
@@ -63,12 +63,12 @@ public class SimpleMemoryAccessMap implements MemoryAccessMap {
   private static final boolean ALWAYS_BUILD_IR = true;
 
   /**
-   * Map: IField -> Set
+   * Map: IField -> Set<MemoryAccess>
    */
   final private Map> readMap = HashMapFactory.make();
 
   /**
-   * Map: IField -> Set
+   * Map: IField -> Set<MemoryAccess>
    */
   final private Map> writeMap = HashMapFactory.make();
 
diff --git a/com.ibm.wala.core/src/com/ibm/wala/escape/FILiveObjectAnalysis.java b/com.ibm.wala.core/src/com/ibm/wala/escape/FILiveObjectAnalysis.java
index 04e7cf7c5..01e3866b1 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/escape/FILiveObjectAnalysis.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/escape/FILiveObjectAnalysis.java
@@ -51,7 +51,7 @@ public class FILiveObjectAnalysis implements ILiveObjectAnalysis {
   private final HeapGraph heapGraph;
 
   /**
-   * Cached map from InstanceKey -> Set
+   * Cached map from InstanceKey -> Set<CGNode>
    */
   final private Map> liveNodes = HashMapFactory.make();
 
diff --git a/com.ibm.wala.core/src/com/ibm/wala/escape/ILiveObjectAnalysis.java b/com.ibm.wala.core/src/com/ibm/wala/escape/ILiveObjectAnalysis.java
index d3254e07d..fdbf2484d 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/escape/ILiveObjectAnalysis.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/escape/ILiveObjectAnalysis.java
@@ -26,8 +26,8 @@ public interface ILiveObjectAnalysis {
    * @param m method in question
    * @param instructionIndex index of an instruction in SSA IR. in m. if -1, it is interpreted as a wildcard meaning "any statement"
    * @throws WalaException
-   * @returns true if an object allocated at the allocation site <allocMethod,allocPC> may be live immediately after the
-   *          statement 
+   * @returns true if an object allocated at the allocation site <allocMethod,allocPC> may be live immediately after the
+   *          statement <m,instructionIndex>
    */
   public boolean mayBeLive(CGNode allocMethod, int allocPC, CGNode m, int instructionIndex) throws WalaException;
 
@@ -36,8 +36,8 @@ public interface ILiveObjectAnalysis {
    * @param m method in question
    * @param instructionIndex index of an instruction in SSA IR. in m. if -1, it is interpreted as a wildcard meaning "any statement"
    * @throws WalaException
-   * @returns true if an object allocated at the allocation site <allocMethod,allocPC> may be live immediately after the
-   *          statement 
+   * @returns true if an object allocated at the allocation site <allocMethod,allocPC> may be live immediately after the
+   *          statement <m,instructionIndex>
    */
   public boolean mayBeLive(InstanceKey ik, CGNode m, int instructionIndex) throws WalaException;
 
@@ -45,8 +45,8 @@ public interface ILiveObjectAnalysis {
    * @param ik an instance key
    * @param m method in question
    * @param instructionIndices indices of instructions in SSA IR.
-   * @returns true if an object allocated at the allocation site <allocMethod,allocPC> may be live immediately after the
-   *          statement  for any instructionIndex in the set
+   * @returns true if an object allocated at the allocation site <allocMethod,allocPC> may be live immediately after the
+   *          statement <m,instructionIndex> for any instructionIndex in the set
    */
   public boolean mayBeLive(InstanceKey ik, CGNode m, IntSet instructionIndices);
 
diff --git a/com.ibm.wala.core/src/com/ibm/wala/escape/IMethodEscapeAnalysis.java b/com.ibm.wala.core/src/com/ibm/wala/escape/IMethodEscapeAnalysis.java
index 8049e80c6..0cf7cc32f 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/escape/IMethodEscapeAnalysis.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/escape/IMethodEscapeAnalysis.java
@@ -22,7 +22,7 @@ public interface IMethodEscapeAnalysis {
    * @param allocMethod a method which holds an allocation site
    * @param allocPC bytecode index of allocation site
    * @param m method in question
-   * @returns true if an object allocated at the allocation site <allocMethod,allocPC> may escape from an activation of method m,
+   * @returns true if an object allocated at the allocation site <allocMethod,allocPC> may escape from an activation of method m,
    *          false otherwise
    */
   public boolean mayEscape(MethodReference allocMethod, int allocPC, MethodReference m) throws WalaException;
diff --git a/com.ibm.wala.core/src/com/ibm/wala/escape/INodeEscapeAnalysis.java b/com.ibm.wala.core/src/com/ibm/wala/escape/INodeEscapeAnalysis.java
index f9015f570..2c10a336d 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/escape/INodeEscapeAnalysis.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/escape/INodeEscapeAnalysis.java
@@ -23,7 +23,7 @@ public interface INodeEscapeAnalysis extends IMethodEscapeAnalysis {
    * @param allocPC bytecode index of allocation site
    * @param node method in question
    * @throws WalaException
-   * @returns true if an object allocated at the allocation site <allocMethod,allocPC> may escape from an activation of node m,
+   * @returns true if an object allocated at the allocation site <allocMethod,allocPC> may escape from an activation of node m,
    *          false otherwise
    */
   public boolean mayEscape(CGNode allocNode, int allocPC, CGNode node) throws WalaException;
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/Context.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/Context.java
index 7d9c76ff3..7fbf6810a 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/Context.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/Context.java
@@ -16,7 +16,7 @@ package com.ibm.wala.ipa.callgraph;
  * For example, for CFA-1, there is only one name ("caller"); and the context maps "caller" to an IMethod
  * 
  * As another example, for CPA, there would be name for each parameter slot ("zero","one","two"), and the Context provides a mapping
- * from this name to a set of types. eg. "one" -> {java.lang.String, java.lang.Date}
+ * from this name to a set of types. eg. "one" -> {java.lang.String, java.lang.Date}
  */
 public interface Context {
   /**
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ExplicitCallGraph.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ExplicitCallGraph.java
index f4d6a5f84..fe7d2295f 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ExplicitCallGraph.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/ExplicitCallGraph.java
@@ -134,7 +134,7 @@ public class ExplicitCallGraph extends BasicCallGraph imp
   public class ExplicitNode extends NodeImpl {
 
     /**
-     * A Mapping from call site program counter (int) -> Object, where Object is a CGNode if we've discovered exactly one target for
+     * A Mapping from call site program counter (int) -> Object, where Object is a CGNode if we've discovered exactly one target for
      * the site, or an IntSet of node numbers if we've discovered more than one target for the site.
      */
     protected final SparseVector targets = new SparseVector<>();
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/UnionContextSelector.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/UnionContextSelector.java
index c4ddb0d85..6846921de 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/UnionContextSelector.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/UnionContextSelector.java
@@ -31,7 +31,7 @@ import com.ibm.wala.util.intset.IntSet;
  *
  *  @see com.ibm.wala.ipa.callgraph.impl.DelegatingContextSelector
  *
- *  @author  Tobias Blaschke 
+ *  @author  Tobias Blaschke <code@tobiasblaschke.de>
  */
 public class UnionContextSelector implements ContextSelector {
     private final ContextSelector A;
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/Util.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/Util.java
index e267887d9..772f294d4 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/Util.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/impl/Util.java
@@ -188,7 +188,7 @@ public class Util {
   /**
    * @return Entrypoints for a set of J2SE Main classes
    * @throws IllegalArgumentException if classNames == null
-   * @throws IllegalArgumentException if (classNames != null) and (0 < classNames.length) and (classNames[0] == null)
+   * @throws IllegalArgumentException if (classNames != null) and (0 < classNames.length) and (classNames[0] == null)
    * @throws IllegalArgumentException if classNames.length == 0
    */
   public static Iterable makeMainEntrypoints(final ClassLoaderReference loaderRef, final IClassHierarchy cha,
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/InstanceKey.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/InstanceKey.java
index 772dd501c..e2ca8d698 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/InstanceKey.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/InstanceKey.java
@@ -23,10 +23,10 @@ import com.ibm.wala.util.collections.Pair;
  * An InstanceKey serves as the representative for an equivalence class of
  * objects in the heap, that can be pointed to.
  * 
- * For example, for 0-CFA, an InstanceKey would embody an ... we model
+ * For example, for 0-CFA, an InstanceKey would embody an <IClass>... we model
  * all instances of a particular class
  * 
- * For 0-1-CFA, an InstanceKey could be , representing a
+ * For 0-1-CFA, an InstanceKey could be <IMethod,statement #>, representing a
  * particular allocation statement in a particular method.
  */
 public interface InstanceKey extends ContextItem {
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerKey.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerKey.java
index 7a9becccc..47239f9ac 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerKey.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PointerKey.java
@@ -14,15 +14,15 @@ package com.ibm.wala.ipa.callgraph.propagation;
  * A PointerKey instance serves as the representative for an equivalence class
  * of pointers. (or more generally ...locations, if we allow primitives).
  * 
- * For example, a PointerKey for 0-CFA might be - a  pair, where the
+ * For example, a PointerKey for 0-CFA might be - a <CGNode,int> pair, where the
  * int represents an SSA value number. This PointerKey would represent all
- * values of the pointer of a particular local variable. - a ,
+ * values of the pointer of a particular local variable. - a <FieldReference>,
  * representing the set of instances of a given field in the heap, or of a
  * particular static field.
  * 
  * A PointerKey for 0-1-CFA, with 1-level of InstanceVar context in the Grove et
- * al. terminology, would instead of FieldReference, use a -  pair
+ * al. terminology, would instead of FieldReference, use a - <InstanceKey,
+ * FieldReference> pair
  */
 public interface PointerKey {
 
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationCallGraphBuilder.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationCallGraphBuilder.java
index 3e5b8cefe..40ef1573f 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationCallGraphBuilder.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationCallGraphBuilder.java
@@ -589,7 +589,7 @@ public abstract class PropagationCallGraphBuilder implements CallGraphBuilder:= Cast_k( )
+   * Unary op: <lhs>:= Cast_k( <rhs>)
    * 
    * (Again, technically a binary op -- see note for Assign)
    * 
@@ -803,7 +803,7 @@ public abstract class PropagationCallGraphBuilder implements CallGraphBuilder:= ArrayLoad( <arrayref>) Side effect: Creates new equations.
+   * Binary op: <dummy>:= ArrayLoad( <arrayref>) Side effect: Creates new equations.
    */
   public final class ArrayLoadOperator extends UnarySideEffect implements IPointerOperator {
     protected final MutableIntSet priorInstances = rememberGetPutHistory ? IntSetUtil.make() : null;
@@ -892,7 +892,7 @@ public abstract class PropagationCallGraphBuilder implements CallGraphBuilder:= ArrayStore( <arrayref>) Side effect: Creates new equations.
+   * Binary op: <dummy>:= ArrayStore( <arrayref>) Side effect: Creates new equations.
    */
   public final class ArrayStoreOperator extends UnarySideEffect implements IPointerOperator {
     @Override
@@ -976,7 +976,7 @@ public abstract class PropagationCallGraphBuilder implements CallGraphBuilder:= GetField( ) Side effect: Creates new equations.
+   * Binary op: <dummy>:= GetField( <ref>) Side effect: Creates new equations.
    */
   public class GetFieldOperator extends UnarySideEffect implements IPointerOperator {
     private final IField field;
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationGraph.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationGraph.java
index dcf9ac3f6..428c24966 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationGraph.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationGraph.java
@@ -442,7 +442,7 @@ public class PropagationGraph implements IFixedPointSystem
   }
 
   /**
-   * A graph of just the variables in the system. v1 -> v2 iff there exists equation e s.t. e uses v1 and e defs v2.
+   * A graph of just the variables in the system. v1 -> v2 iff there exists equation e s.t. e uses v1 and e defs v2.
    * 
    * Note that this graph trickily and fragilely reuses the nodeManager from the delegateGraph, above. This will work ok as long as
    * every variable is inserted in the delegateGraph.
@@ -834,7 +834,7 @@ public class PropagationGraph implements IFixedPointSystem
   }
 
   /**
-   * A graph of just the variables in the system. v1 -> v2 iff there exists an assignment equation e s.t. e uses v1 and e defs v2.
+   * A graph of just the variables in the system. v1 -> v2 iff there exists an assignment equation e s.t. e uses v1 and e defs v2.
    * 
    */
   public NumberedGraph getAssignmentGraph() {
@@ -848,7 +848,7 @@ public class PropagationGraph implements IFixedPointSystem
   }
 
   /**
-   * A graph of just the variables in the system. v1 -> v2 iff there exists an Assingnment or Filter equation e s.t. e uses v1 and e
+   * A graph of just the variables in the system. v1 -> v2 iff there exists an Assingnment or Filter equation e s.t. e uses v1 and e
    * defs v2.
    * 
    */
@@ -871,7 +871,7 @@ public class PropagationGraph implements IFixedPointSystem
   }
 
   /**
-   * A graph of just the variables in the system. v1 -> v2 that are related by def-use with "interesting" operators
+   * A graph of just the variables in the system. v1 -> v2 that are related by def-use with "interesting" operators
    * 
    */
   private abstract class FilteredConstraintGraphView extends AbstractNumberedGraph {
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationSystem.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationSystem.java
index 41f683ea4..c0fd3823c 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationSystem.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/PropagationSystem.java
@@ -81,7 +81,7 @@ public class PropagationSystem extends DefaultFixedPointSolver instanceKeys = MutableMapping.make();
 
   /**
-   * A mapping from IClass -> MutableSharedBitVectorIntSet The range represents the instance keys that correspond to a given class.
+   * A mapping from IClass -> MutableSharedBitVectorIntSet The range represents the instance keys that correspond to a given class.
    * This mapping is used to filter sets based on declared types; e.g., in cast constraints
    */
   final private Map class2InstanceKey = HashMapFactory.make();
@@ -104,7 +104,7 @@ public class PropagationSystem extends DefaultFixedPointSolver Set
+   * This maintains a map from PointsToSetVariable -> Set<UnarySideEffect>
    */
   final private Map> fixedSetMap = HashMapFactory.make();
 
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallerContextPair.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallerContextPair.java
index cf55d55fe..6c27ec084 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallerContextPair.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallerContextPair.java
@@ -17,7 +17,7 @@ import com.ibm.wala.ipa.callgraph.ContextItem;
 import com.ibm.wala.ipa.callgraph.ContextKey;
 
 /**
- * This is a {@link Context} which is defined by a pair consisting of .
+ * This is a {@link Context} which is defined by a pair consisting of <caller node, base context>.
  * 
  * The base context is typically some special case; e.g., a JavaTypeContext used for reflection.
  */
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallerSiteContext.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallerSiteContext.java
index 662378aa4..540c407e1 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallerSiteContext.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallerSiteContext.java
@@ -16,7 +16,7 @@ import com.ibm.wala.ipa.callgraph.ContextItem;
 import com.ibm.wala.ipa.callgraph.ContextKey;
 
 /**
- * A context which is a  pair.
+ * A context which is a <CGNode, CallSiteReference> pair.
  */
 public class CallerSiteContext extends CallerContext {
 
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallerSiteContextPair.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallerSiteContextPair.java
index 3db0f3075..a6d54e221 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallerSiteContextPair.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/CallerSiteContextPair.java
@@ -17,7 +17,7 @@ import com.ibm.wala.ipa.callgraph.ContextItem;
 import com.ibm.wala.ipa.callgraph.ContextKey;
 
 /**
- * This is a context which is defined by a pair consisting of .
+ * This is a context which is defined by a pair consisting of <caller node, base context>.
  * 
  * The base context is typically some special case; e.g., a JavaTypeContext used for reflection.
  */
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ZeroXInstanceKeys.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ZeroXInstanceKeys.java
index db7b94257..f9d76366f 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ZeroXInstanceKeys.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/cfa/ZeroXInstanceKeys.java
@@ -86,8 +86,8 @@ public class ZeroXInstanceKeys implements InstanceKeyFactory {
   public static final int SMUSH_PRIMITIVE_HOLDERS = 8;
 
   /**
-   * This variant counts the N, number of allocation sites of a particular type T in each method. If N > SMUSH_LIMIT, then these N
-   * allocation sites are NOT distinguished ... instead there is a single abstract allocation site for 
+   * This variant counts the N, number of allocation sites of a particular type T in each method. If N > SMUSH_LIMIT, then these N
+   * allocation sites are NOT distinguished ... instead there is a single abstract allocation site for <N,T>
    * 
    * Probably the best choice in many cases.
    */
@@ -134,7 +134,7 @@ public class ZeroXInstanceKeys implements InstanceKeyFactory {
   final private RTAContextInterpreter contextInterpreter;
 
   /**
-   * a Map from CGNode->Set that should be smushed.
+   * a Map from CGNode->Set<IClass> that should be smushed.
    */
   protected final Map> smushMap = HashMapFactory.make();
 
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/DelegatingExplicitCallGraph.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/DelegatingExplicitCallGraph.java
index c838a2837..10ffd625b 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/DelegatingExplicitCallGraph.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/DelegatingExplicitCallGraph.java
@@ -50,10 +50,10 @@ public class DelegatingExplicitCallGraph extends ExplicitCallGraph {
   }
 
   /**
-   * In this implementation, super.targets is a mapping from call site ->
+   * In this implementation, super.targets is a mapping from call site ->
    * Object, where Object is a
    * 
    
-   * A Mapping from call site -> Object, where Object is a
+   * A Mapping from call site -> Object, where Object is a
    * 
  • CGNode if we've discovered exactly one target for the site
    * 
  •  or an IntSet of node numbers if we've discovered more than one target
    * for the site.
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/TypeBasedHeapModel.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/TypeBasedHeapModel.java
index de22c02ba..36100c4ac 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/TypeBasedHeapModel.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/TypeBasedHeapModel.java
@@ -63,14 +63,14 @@ public class TypeBasedHeapModel implements HeapModel {
   private final Collection nodesHandled = HashSetFactory.make();
 
   /**
-   * Map:  -> thing, where thing is a FilteredPointerKey or an InstanceKey representing a constant.
+   * Map: <PointerKey> -> thing, where thing is a FilteredPointerKey or an InstanceKey representing a constant.
    * 
    * computed lazily
    */
   private Map pKeys;
 
   /**
-   * @param klasses Collection
+   * @param klasses Collection<IClass>
    * @throws IllegalArgumentException if cg is null
    */
   public TypeBasedHeapModel(AnalysisOptions options, Collection klasses, CallGraph cg) {
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/TypeBasedPointerAnalysis.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/TypeBasedPointerAnalysis.java
index c43836c1b..57262c502 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/TypeBasedPointerAnalysis.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/callgraph/propagation/rta/TypeBasedPointerAnalysis.java
@@ -48,7 +48,7 @@ public class TypeBasedPointerAnalysis extends AbstractPointerAnalysis {
   private final TypeBasedHeapModel heapModel;
 
   /**
-   * Map: IClass -> OrdinalSet
+   * Map: IClass -> OrdinalSet
    */
   private final Map> pointsTo = HashMapFactory.make();
 
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/ClassHierarchy.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/ClassHierarchy.java
index 8ed3fddf0..a02126813 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/ClassHierarchy.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/ClassHierarchy.java
@@ -98,7 +98,7 @@ public class ClassHierarchy implements IClassHierarchy {
   final private IClassLoader[] loaders;
 
   /**
-   * A mapping from IClass -> Selector -> Set of IMethod
+   * A mapping from IClass -> Selector -> Set of IMethod
    */
   final private HashMap targetCache = HashMapFactory.make();
 
@@ -108,7 +108,7 @@ public class ClassHierarchy implements IClassHierarchy {
   private final AnalysisScope scope;
 
   /**
-   * A mapping from IClass (representing an interface) -> Set of IClass that implement that interface
+   * A mapping from IClass (representing an interface) -> Set of IClass that implement that interface
    */
   private final Map> implementors = HashMapFactory.make();
 
@@ -645,7 +645,7 @@ public class ClassHierarchy implements IClassHierarchy {
 
   /**
    * Number the class hierarchy tree to support efficient subclass tests. After numbering the tree, n1 is a child of n2 iff n2.left
-   * <= n1.left ^ n1.left <= n2.right. Described as "relative numbering" by Vitek, Horspool, and Krall, OOPSLA 97
+   * <= n1.left ^ n1.left <= n2.right. Described as "relative numbering" by Vitek, Horspool, and Krall, OOPSLA 97
    * 
    * TODO: this implementation is recursive; un-recursify if needed
    */
@@ -999,7 +999,7 @@ public class ClassHierarchy implements IClassHierarchy {
   }
 
   /**
-   * Solely for optimization; return a Collection representing the subclasses of Error
+   * Solely for optimization; return a Collection<TypeReference> representing the subclasses of Error
    * 
    * kind of ugly. a better scheme?
    */
@@ -1016,7 +1016,7 @@ public class ClassHierarchy implements IClassHierarchy {
   }
 
   /**
-   * Solely for optimization; return a Collection representing the subclasses of RuntimeException
+   * Solely for optimization; return a Collection<TypeReference> representing the subclasses of RuntimeException
    * 
    * kind of ugly. a better scheme?
    */
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/IClassHierarchy.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/IClassHierarchy.java
index aa83fda8b..8f1676a20 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/IClassHierarchy.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/cha/IClassHierarchy.java
@@ -144,14 +144,14 @@ public interface IClassHierarchy extends Iterable {
   public Collection computeSubClasses(TypeReference type);
 
   /**
-   * Solely for optimization; return a Collection representing the subclasses of Error
+   * Solely for optimization; return a Collection<TypeReference> representing the subclasses of Error
    * 
    * kind of ugly. a better scheme?
    */
   public Collection getJavaLangErrorTypes();
 
   /**
-   * Solely for optimization; return a Collection representing the subclasses of {@link RuntimeException}
+   * Solely for optimization; return a Collection<TypeReference> representing the subclasses of {@link RuntimeException}
    * 
    * kind of ugly. a better scheme?
    */
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/modref/ModRefFieldAccess.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/modref/ModRefFieldAccess.java
index b25c69c74..fc9fed3bf 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/modref/ModRefFieldAccess.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/modref/ModRefFieldAccess.java
@@ -33,7 +33,7 @@ import com.ibm.wala.util.collections.Iterator2Iterable;
  * Computes interprocedural field accesses for a given method.
  * 
  * @author Martin Seidel
- * @author Juergen Graf 
+ * @author Juergen Graf <juergen.graf@gmail.com>
  *
  */
 public final class ModRefFieldAccess {
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/BypassMethodTargetSelector.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/BypassMethodTargetSelector.java
index a415253c2..8a391beab 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/BypassMethodTargetSelector.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/BypassMethodTargetSelector.java
@@ -45,7 +45,7 @@ public class BypassMethodTargetSelector implements MethodTargetSelector {
   static final boolean DEBUG = false;
 
   /**
-   * Method summaries collected for methods. Mapping Object -> MethodSummary where Object is either a
+   * Method summaries collected for methods. Mapping Object -> MethodSummary where Object is either a
    * 
      
    * 
    • MethodReference
    * 
    • TypeReference
@@ -75,7 +75,7 @@ public class BypassMethodTargetSelector implements MethodTargetSelector {
   private final ClassHierarchyMethodTargetSelector chaMethodTargetSelector;
 
   /**
-   * Mapping from MethodReference -> SyntheticMethod We may call syntheticMethod.put(m,null) .. in which case we use containsKey()
+   * Mapping from MethodReference -> SyntheticMethod We may call syntheticMethod.put(m,null) .. in which case we use containsKey()
    * to check for having already considered m.
    */
   final private HashMap syntheticMethods = HashMapFactory.make();
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/MethodBypass.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/MethodBypass.java
index d3db86930..7238e4e9a 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/MethodBypass.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/MethodBypass.java
@@ -37,7 +37,7 @@ public class MethodBypass {
   static final boolean DEBUG = false;
 
   /**
-   * Method summaries collected for methods. Mapping Object -> MethodSummary where Object is either a
+   * Method summaries collected for methods. Mapping Object -> MethodSummary where Object is either a
    * 
        
    * 
      • MethodReference
    * 
      • TypeReference
@@ -57,7 +57,7 @@ public class MethodBypass {
   private final IClassHierarchy cha;
 
   /**
-   * Mapping from MethodReference -> SyntheticMethod
+   * Mapping from MethodReference -> SyntheticMethod
    */
   final private HashMap syntheticMethods = HashMapFactory.make();
 
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/MethodSummary.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/MethodSummary.java
index 97ed3cf36..6a24542e7 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/MethodSummary.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/MethodSummary.java
@@ -40,7 +40,7 @@ public class MethodSummary {
   private ArrayList statements;
 
   /**
-   * Map: value number -> constant
+   * Map: value number -> constant
    */
   private Map constantValues;
 
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/SummarizedMethodWithNames.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/SummarizedMethodWithNames.java
index 95bcf64f8..2de53a0e3 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/SummarizedMethodWithNames.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/SummarizedMethodWithNames.java
@@ -63,7 +63,7 @@ import com.ibm.wala.util.strings.Atom;
  *  names in synthetic methods. This should not change th analysis-result but may come in handy when
  *  debugging.
  *
- *  @author     Tobias Blaschke 
+ *  @author     Tobias Blaschke <code@tobiasblaschke.de>
  *  @since      2013-11-25
  */
 public class SummarizedMethodWithNames extends SummarizedMethod {
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/VolatileMethodSummary.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/VolatileMethodSummary.java
index 35bd36d1a..3c66cd1d6 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/VolatileMethodSummary.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/VolatileMethodSummary.java
@@ -79,7 +79,7 @@ import com.ibm.wala.util.strings.Atom;
  *  @see com.ibm.wala.dalvik.ipa.callgraph.impl.DexFakeRootMethod
  *  @see com.ibm.wala.ipa.summaries.MethodSummary
  *
- *  @author     Tobias Blaschke 
+ *  @author     Tobias Blaschke <code@tobiasblaschke.de>
  *  @since      2013-09-08
  */
 @SuppressWarnings("javadoc")
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/XMLMethodSummaryReader.java b/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/XMLMethodSummaryReader.java
index 31b2d53bb..e3e4bc2bc 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/XMLMethodSummaryReader.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ipa/summaries/XMLMethodSummaryReader.java
@@ -269,7 +269,7 @@ public class XMLMethodSummaryReader implements BytecodeConstants {
     private int nextLocal = -1;
 
     /**
-     * A mapping from String (variable name) -> Integer (local number)
+     * A mapping from String (variable name) -> Integer (local number)
      */
     private Map symbolTable = null;
 
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ssa/AuxiliaryCache.java b/com.ibm.wala.core/src/com/ibm/wala/ssa/AuxiliaryCache.java
index b7f15c7aa..bd9422a96 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ssa/AuxiliaryCache.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ssa/AuxiliaryCache.java
@@ -26,19 +26,19 @@ import com.ibm.wala.util.ref.CacheReference;
 /**
  * A cache for auxiliary information based on an SSA representation
  * 
- * A mapping from (IMethod,Context) -> SSAOptions -> SoftReference -> something
+ * A mapping from (IMethod,Context) -> SSAOptions -> SoftReference -> something
  * 
  * This doesn't work very well ... GCs don't do such a great job with SoftReferences ... revamp it.
  */
 public class AuxiliaryCache implements IAuxiliaryCache {
 
   /**
-   * A mapping from IMethod -> SSAOptions -> SoftReference -> IR
+   * A mapping from IMethod -> SSAOptions -> SoftReference -> IR
    */
   private HashMap, Map> dictionary = HashMapFactory.make();
 
   /**
-   * Help out the garbage collector: clear this cache when the number of items is > RESET_THRESHOLD
+   * Help out the garbage collector: clear this cache when the number of items is > RESET_THRESHOLD
    */
   final private static int RESET_THRESHOLD = 2000;
 
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ssa/DefUse.java b/com.ibm.wala.core/src/com/ibm/wala/ssa/DefUse.java
index 330b79eba..2e75f6d2a 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ssa/DefUse.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ssa/DefUse.java
@@ -28,17 +28,17 @@ public class DefUse {
   static final boolean DEBUG = false;
 
   /**
-   * A mapping from integer (value number) -> {@link SSAInstruction} that defines the value
+   * A mapping from integer (value number) -> {@link SSAInstruction} that defines the value
    */
   final private SSAInstruction[] defs;
 
   /**
-   * A mapping from integer (value number) -> bit vector holding integers representing instructions that use the value number
+   * A mapping from integer (value number) -> bit vector holding integers representing instructions that use the value number
    */
   final private MutableIntSet[] uses;
 
   /**
-   * A Mapping from integer -> Instruction
+   * A Mapping from integer -> Instruction
    */
   final protected ArrayList allInstructions = new ArrayList<>();
 
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ssa/IAuxiliaryCache.java b/com.ibm.wala.core/src/com/ibm/wala/ssa/IAuxiliaryCache.java
index f310f0dc1..3192be3fd 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ssa/IAuxiliaryCache.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ssa/IAuxiliaryCache.java
@@ -28,7 +28,7 @@ interface IAuxiliaryCache {
   Object find(IMethod m, Context c, SSAOptions options);
 
   /**
-   * cache new auxiliary information for an  pair
+   * cache new auxiliary information for an <m,options> pair
    * 
    * @param m a method
    * @param options options governing ssa construction
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ssa/SSABuilder.java b/com.ibm.wala.core/src/com/ibm/wala/ssa/SSABuilder.java
index 27020ea96..7147aa3a4 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ssa/SSABuilder.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ssa/SSABuilder.java
@@ -87,7 +87,7 @@ public class SSABuilder extends AbstractIntStackMachine {
   final private SymbolTable symbolTable;
 
   /**
-   * A logical mapping from  -> local number if null, don't build it.
+   * A logical mapping from <bcIndex, valueNumber> -> local number if null, don't build it.
    */
   private final SSA2LocalMap localMap;
 
@@ -923,7 +923,7 @@ public class SSABuilder extends AbstractIntStackMachine {
   }
   
   /**
-   * A logical mapping from  -> local number Note: make sure this class remains static: this persists as part of
+   * A logical mapping from <pc, valueNumber> -> local number Note: make sure this class remains static: this persists as part of
    * the IR!!
    */
   private static class SSA2LocalMap implements com.ibm.wala.ssa.IR.SSA2LocalMap {
@@ -931,7 +931,7 @@ public class SSABuilder extends AbstractIntStackMachine {
     private final ShrikeCFG shrikeCFG;
 
     /**
-     * Mapping Integer -> IntPair where p maps to (vn,L) iff we've started a range at pc p where value number vn corresponds to
+     * Mapping Integer -> IntPair where p maps to (vn,L) iff we've started a range at pc p where value number vn corresponds to
      * local L
      */
     private final IntPair[] localStoreMap;
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ssa/SSACFG.java b/com.ibm.wala.core/src/com/ibm/wala/ssa/SSACFG.java
index 20110fd3f..0350c0fce 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ssa/SSACFG.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ssa/SSACFG.java
@@ -1041,7 +1041,7 @@ public class SSACFG implements ControlFlowGraph,
   }
 
   /**
-   * has exceptional edge src -> dest
+   * has exceptional edge src -> dest
    * 
    * @throws IllegalArgumentException if dest is null
    */
@@ -1057,7 +1057,7 @@ public class SSACFG implements ControlFlowGraph,
   }
 
   /**
-   * has normal edge src -> dest
+   * has normal edge src -> dest
    * 
    * @throws IllegalArgumentException if dest is null
    */
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ssa/SSACache.java b/com.ibm.wala.core/src/com/ibm/wala/ssa/SSACache.java
index 2e04349a9..9b3a1fa90 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ssa/SSACache.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ssa/SSACache.java
@@ -15,7 +15,7 @@ import com.ibm.wala.ipa.callgraph.Context;
 import com.ibm.wala.ipa.callgraph.impl.Everywhere;
 
 /**
- * A mapping from IMethod -> SSAOptions -> SoftReference -> Something
+ * A mapping from IMethod -> SSAOptions -> SoftReference -> Something
  * 
  * This doesn't work very well ... GCs don't do such a great job with SoftReferences ... revamp it.
  */
@@ -132,21 +132,21 @@ public class SSACache {
   }
 
   /**
-   * Invalidate the cached IR for a  pair
+   * Invalidate the cached IR for a <method,context> pair
    */
   public void invalidateIR(IMethod method, Context c) {
     irCache.invalidate(method, c);
   }
 
   /**
-   * Invalidate the cached {@link DefUse} for a  pair
+   * Invalidate the cached {@link DefUse} for a <method,context> pair
    */
   public void invalidateDU(IMethod method, Context c) {
     duCache.invalidate(method, c);
   }
 
   /**
-   * Invalidate all cached information for a  pair
+   * Invalidate all cached information for a <method,context> pair
    */
   public void invalidate(IMethod method, Context c) {
     invalidateIR(method, c);
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ssa/SymbolTable.java b/com.ibm.wala.core/src/com/ibm/wala/ssa/SymbolTable.java
index f9cd66b5a..1138a7c5d 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ssa/SymbolTable.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ssa/SymbolTable.java
@@ -32,7 +32,7 @@ public class SymbolTable implements Cloneable {
   final private int[] parameters;
 
   /**
-   * Mapping from Constant -> value number
+   * Mapping from Constant -> value number
    */
   private HashMap constants = HashMapFactory.make(10);
 
@@ -52,7 +52,7 @@ public class SymbolTable implements Cloneable {
   }
 
   /**
-   * Values. Note: this class must maintain the following invariant: values.length > nextFreeValueNumber.
+   * Values. Note: this class must maintain the following invariant: values.length > nextFreeValueNumber.
    */
   private Value[] values = new Value[5];
 
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ssa/analysis/DeadAssignmentElimination.java b/com.ibm.wala.core/src/com/ibm/wala/ssa/analysis/DeadAssignmentElimination.java
index 98cb3e811..5705ccee3 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ssa/analysis/DeadAssignmentElimination.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ssa/analysis/DeadAssignmentElimination.java
@@ -87,7 +87,7 @@ public class DeadAssignmentElimination {
   private static class DeadValueSystem extends DefaultFixedPointSolver {
 
     /**
-     * Map: value number -> BooleanVariable isLive
+     * Map: value number -> BooleanVariable isLive
      */
     final private Map vars = HashMapFactory.make();
 
diff --git a/com.ibm.wala.core/src/com/ibm/wala/types/Descriptor.java b/com.ibm.wala.core/src/com/ibm/wala/types/Descriptor.java
index 750fe7f92..f408ca600 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/types/Descriptor.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/types/Descriptor.java
@@ -26,7 +26,7 @@ import com.ibm.wala.util.strings.UTF8Convert;
 public final class Descriptor {
 
   /**
-   * A mapping from Key -> Descriptor
+   * A mapping from Key -> Descriptor
    */
   private static final Map map = HashMapFactory.make();
 
diff --git a/com.ibm.wala.core/src/com/ibm/wala/types/FieldReference.java b/com.ibm.wala.core/src/com/ibm/wala/types/FieldReference.java
index 80262fb58..306f6911c 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/types/FieldReference.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/types/FieldReference.java
@@ -25,7 +25,7 @@ public final class FieldReference extends MemberReference {
   private final static boolean DEBUG = false;
 
   /**
-   * Used to canonicalize MemberReferences a mapping from Key -> MemberReference
+   * Used to canonicalize MemberReferences a mapping from Key -> MemberReference
    */
   final private static HashMap dictionary = HashMapFactory.make();
 
diff --git a/com.ibm.wala.core/src/com/ibm/wala/types/MethodReference.java b/com.ibm.wala.core/src/com/ibm/wala/types/MethodReference.java
index 4a7063f16..833db8b42 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/types/MethodReference.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/types/MethodReference.java
@@ -22,7 +22,7 @@ import com.ibm.wala.util.strings.Atom;
  */
 public final class MethodReference extends MemberReference {
   /**
-   * Used to canonicalize MethodReferences a mapping from Key -> MethodReference
+   * Used to canonicalize MethodReferences a mapping from Key -> MethodReference
    */
   final private static HashMap dictionary = HashMapFactory.make();
 
diff --git a/com.ibm.wala.core/src/com/ibm/wala/types/TypeName.java b/com.ibm.wala.core/src/com/ibm/wala/types/TypeName.java
index 2e42e305a..a2e913e9f 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/types/TypeName.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/types/TypeName.java
@@ -39,7 +39,7 @@ public final class TypeName implements Serializable {
   private static final long serialVersionUID = -3256390509887654326L;
 
   /**
-   * canonical mapping from TypeNameKey -> TypeName
+   * canonical mapping from TypeNameKey -> TypeName
    */
   private final static Map map = HashMapFactory.make();
 
@@ -253,7 +253,7 @@ public final class TypeName implements Serializable {
      *                  0 => class 
      *                  >0 => mask of levels of array, reference, pointer
      *                  
-     *  When the mask is > 0, it represents levels of type qualifiers (in C 
+     *  When the mask is > 0, it represents levels of type qualifiers (in C
      *  terminology) for array, reference and pointer types.  There is also a
      *  special mask for when the innermost type is a primitive.  The mask is
      *  a bitfield laid out in inverse dimension order. 
diff --git a/com.ibm.wala.core/src/com/ibm/wala/types/TypeReference.java b/com.ibm.wala.core/src/com/ibm/wala/types/TypeReference.java
index 8d26bfbf9..145ef38c8 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/types/TypeReference.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/types/TypeReference.java
@@ -579,9 +579,9 @@ public final class TypeReference implements Serializable {
    * TypeReferences are canonical. However, note that two TypeReferences can be non-equal, yet still represent the same
    * IClass.
    * 
-   * For example, the there can be two TypeReferences  and .
    * These two TypeReference are NOT equal(), but they both represent the IClass which is named
-   * 
+   * For example, the there can be two TypeReferences <Application,java.lang.Object> and <Primordial,java.lang.Object>.
+   * <Primordial,java.lang.Object>
    */
   @Override
   public final boolean equals(Object other) {
diff --git a/com.ibm.wala.core/src/com/ibm/wala/types/generics/ClassSignature.java b/com.ibm.wala.core/src/com/ibm/wala/types/generics/ClassSignature.java
index 13ed39234..bc720a33c 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/types/generics/ClassSignature.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/types/generics/ClassSignature.java
@@ -20,7 +20,7 @@ import com.ibm.wala.shrikeCT.InvalidClassFileException;
  * Under construction.
  * 
  * ClassSignature: 
- *    ()? SuperclassSignature SuperinterfaceSignature*
+ *    (<FormalTypeParameter+>)? SuperclassSignature SuperinterfaceSignature*
  * 
  * SuperclassSignature:
  *    ClassTypeSignature
diff --git a/com.ibm.wala.core/src/com/ibm/wala/types/generics/ClassTypeSignature.java b/com.ibm.wala.core/src/com/ibm/wala/types/generics/ClassTypeSignature.java
index 2710ef33f..504a43c54 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/types/generics/ClassTypeSignature.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/types/generics/ClassTypeSignature.java
@@ -28,7 +28,7 @@ import com.ibm.wala.types.TypeReference;
  *   Identifier TypeArguments?
  *   
  * TypeArguments:
- *   
+ *   <TypeArguments+>
  * 
  * @author sjfink
  * 
diff --git a/com.ibm.wala.core/src/com/ibm/wala/util/PrimitiveAssignability.java b/com.ibm.wala.core/src/com/ibm/wala/util/PrimitiveAssignability.java
index ca78be48d..519fc38c3 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/util/PrimitiveAssignability.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/util/PrimitiveAssignability.java
@@ -54,7 +54,7 @@ import com.ibm.wala.types.TypeReference;
  *
  *  This Class does not consider Boxing / Unboxing 
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  *  @since  2013-11-21
  */
 public class PrimitiveAssignability {
diff --git a/com.ibm.wala.core/src/com/ibm/wala/util/bytecode/BytecodeStream.java b/com.ibm.wala.core/src/com/ibm/wala/util/bytecode/BytecodeStream.java
index 8c19c2de9..61fa24399 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/util/bytecode/BytecodeStream.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/util/bytecode/BytecodeStream.java
@@ -243,7 +243,7 @@ public class BytecodeStream implements BytecodeConstants {
   }
 
   /**
-   * Returns the offset of the branch (as a signed short) Used for if, ificmp, ifacmp, goto, jsr
+   * Returns the offset of the branch (as a signed short) Used for if<cond>, ificmp<cond>, ifacmp<cond>, goto, jsr
    * 
    * @return branch offset
    * @see #getWideBranchOffset()
diff --git a/com.ibm.wala.core/src/com/ibm/wala/util/ssa/ClassLookupException.java b/com.ibm.wala.core/src/com/ibm/wala/util/ssa/ClassLookupException.java
index dcf8c12ab..6c1336e4e 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/util/ssa/ClassLookupException.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/util/ssa/ClassLookupException.java
@@ -51,7 +51,7 @@ package com.ibm.wala.util.ssa;
  *  In typical cases this should not be propergated out from the utility
  *  classes.
  *
- *  @author     Tobias Blaschke 
+ *  @author     Tobias Blaschke <code@tobiasblaschke.de>
  */
 public class ClassLookupException extends RuntimeException {
     private static final long serialVersionUID = 7551139209041666026L;
diff --git a/com.ibm.wala.core/src/com/ibm/wala/util/ssa/IInstantiator.java b/com.ibm.wala.core/src/com/ibm/wala/util/ssa/IInstantiator.java
index 3b844712a..e42b4b98d 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/util/ssa/IInstantiator.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/util/ssa/IInstantiator.java
@@ -52,7 +52,7 @@ import com.ibm.wala.types.TypeReference;
  *
  * This mainly applies to the connectThrough-Function.
  *
- * @author Tobias Blaschke 
+ * @author Tobias Blaschke <code@tobiasblaschke.de>
  */
 public interface IInstantiator {
     /**
diff --git a/com.ibm.wala.core/src/com/ibm/wala/util/ssa/ParameterAccessor.java b/com.ibm.wala.core/src/com/ibm/wala/util/ssa/ParameterAccessor.java
index 0b903178c..58eb27a96 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/util/ssa/ParameterAccessor.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/util/ssa/ParameterAccessor.java
@@ -77,7 +77,7 @@ import com.ibm.wala.util.ssa.SSAValue.WeaklyNamedKey;
  *  If you want to alter the values of the incoming parameters you may also want to use the ParameterManager
  *  which tracks the changes.
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  *  @since  2013-10-19
  */
 public class ParameterAccessor {
@@ -142,7 +142,7 @@ public class ParameterAccessor {
      *
      *  Use .getNumber() to access the associated SSA-Value.
      *
-     *  @author Tobias Blaschke 
+     *  @author Tobias Blaschke <code@tobiasblaschke.de>
      *  @since  2013-10-19
      */
     public static class Parameter extends SSAValue {
@@ -1582,7 +1582,7 @@ public class ParameterAccessor {
     }
 
     /**
-     *  Shorthand for forInvokeStatic(final List args, final ParameterAccessor target, final IClassHierarchy cha).
+     *  Shorthand for forInvokeStatic(final List<? extends Parameter> args, final ParameterAccessor target, final IClassHierarchy cha).
      *
      *  Generates a new ParameterAccessor for target and hands the call through.
      */
@@ -1591,7 +1591,7 @@ public class ParameterAccessor {
     }
 
     /**
-     *  Shorthand for forInvokeVirtual(final int self, final List args, final ParameterAccessor target, final IClassHierarchy cha).
+     *  Shorthand for forInvokeVirtual(final int self, final List<? extends Parameter> args, final ParameterAccessor target, final IClassHierarchy cha).
      *
      *  Generates a new ParameterAccessor for target and hands the call through.
      */
diff --git a/com.ibm.wala.core/src/com/ibm/wala/util/ssa/SSAValue.java b/com.ibm.wala.core/src/com/ibm/wala/util/ssa/SSAValue.java
index 5def15e17..852ec0af7 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/util/ssa/SSAValue.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/util/ssa/SSAValue.java
@@ -57,7 +57,7 @@ import com.ibm.wala.types.TypeReference;
  *  @see    com.ibm.wala.util.ssa.TypeSafeInstructionFactory
  *  @see    com.ibm.wala.util.ssa.ParameterAccessor
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  *  @since  2013-10-20
  */
 public class SSAValue {
diff --git a/com.ibm.wala.core/src/com/ibm/wala/util/ssa/SSAValueManager.java b/com.ibm.wala.core/src/com/ibm/wala/util/ssa/SSAValueManager.java
index 41d4a42cb..49218f701 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/util/ssa/SSAValueManager.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/util/ssa/SSAValueManager.java
@@ -57,7 +57,7 @@ import com.ibm.wala.util.strings.Atom;
 /**
  *  Manage SSA-Variables in synthetic methods.
  *
- *  @author  Tobias Blaschke 
+ *  @author  Tobias Blaschke <code@tobiasblaschke.de>
  *  @since   2013-09-19
  */
 public class SSAValueManager {
diff --git a/com.ibm.wala.core/src/com/ibm/wala/util/ssa/TypeSafeInstructionFactory.java b/com.ibm.wala.core/src/com/ibm/wala/util/ssa/TypeSafeInstructionFactory.java
index 7917fe96f..c7429f1ba 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/util/ssa/TypeSafeInstructionFactory.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/util/ssa/TypeSafeInstructionFactory.java
@@ -77,7 +77,7 @@ import com.ibm.wala.types.TypeReference;
  *
  *  @see    com.ibm.wala.classLoader.JavaLanguage.JavaInstructionFactory
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  *  @since  2013-10-20
  */
 public class TypeSafeInstructionFactory {
diff --git a/com.ibm.wala.core/src/com/ibm/wala/util/ssa/package-info.java b/com.ibm.wala.core/src/com/ibm/wala/util/ssa/package-info.java
index 88f11c265..72813200f 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/util/ssa/package-info.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/util/ssa/package-info.java
@@ -51,6 +51,6 @@
  *  the regular one.
  *
  *  @since  2013-10-25
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  */
 package com.ibm.wala.util.ssa;
diff --git a/com.ibm.wala.core/src/com/ibm/wala/util/strings/Atom.java b/com.ibm.wala.core/src/com/ibm/wala/util/strings/Atom.java
index 3bfab6b15..b75bb8d37 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/util/strings/Atom.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/util/strings/Atom.java
@@ -28,7 +28,7 @@ public final class Atom implements Serializable {
   private static final long serialVersionUID = -3256390509887654329L;
 
   /**
-   * Used to canonicalize Atoms, a mapping from AtomKey -> Atom. AtomKeys are not canonical, but Atoms are.
+   * Used to canonicalize Atoms, a mapping from AtomKey -> Atom. AtomKeys are not canonical, but Atoms are.
    */
   final private static HashMap dictionary = HashMapFactory.make();
 
@@ -196,8 +196,8 @@ public final class Atom implements Serializable {
   }
 
 /**
-   * Is "this" atom a reserved member name? Note: Sun has reserved all member names starting with '<' for future use. At present,
-   * only  and  are used.
+   * Is "this" atom a reserved member name? Note: Sun has reserved all member names starting with '<' for future use. At present,
+   * only <init> and <clinit> are used.
    */
   public final boolean isReservedMemberName() {
     if (length() == 0) {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModel.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModel.java
index 4784f89c2..782186b33 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModel.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModel.java
@@ -120,7 +120,7 @@ import com.ibm.wala.util.strings.Atom;
  *
  *  All these Models are added to a synthetic AndroidModelClass.
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  */
 public class AndroidModel /* makes SummarizedMethod */ 
         implements IClassHierarchyDweller {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModelClass.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModelClass.java
index e67d7967c..aa6d104f4 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModelClass.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/AndroidModelClass.java
@@ -86,7 +86,7 @@ import com.ibm.wala.util.strings.Atom;
  *
  *  @see    com.ibm.wala.ipa.callgraph.impl.FakeRootClass
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  *  @todo   Move this class into an other loader? Currently: Primordial
  */
 public final /* singleton */ class AndroidModelClass extends SyntheticClass {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/IntentModel.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/IntentModel.java
index 7580e8313..85b8bf902 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/IntentModel.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/IntentModel.java
@@ -51,7 +51,7 @@ import com.ibm.wala.util.strings.Atom;
 /**
  *  Like MicroModel but includes CallBacks.
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  *  @since  2014-02-12
  */
 public class IntentModel extends AndroidModel {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/MicroModel.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/MicroModel.java
index 1bdb21a2e..2b341c9da 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/MicroModel.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/MicroModel.java
@@ -52,7 +52,7 @@ import com.ibm.wala.util.strings.Atom;
  *
  *  Is used by the IntentContextInterpreter if a Intent can be resolved internally.
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  *  @since  2013-10-12
  */
 public class MicroModel extends AndroidModel {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/MiniModel.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/MiniModel.java
index f3a2a70e2..7358ba2c4 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/MiniModel.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/MiniModel.java
@@ -66,7 +66,7 @@ import com.ibm.wala.util.strings.Atom;
  *  the Context at the call site is insufficient to determine the actual target. In this case an 
  *  UnknownTargetModel which uses an MiniModel and an ExternalModel is placed there.
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  *  @since  2013-10-29
  */
 public class MiniModel extends AndroidModel {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/package-info.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/package-info.java
index 243525e48..46fb304b1 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/package-info.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/package-info.java
@@ -93,6 +93,6 @@
  *  should have been read or overrides been placed manually (or both).
  *
  *  @since  2013-10-25
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  */
 package com.ibm.wala.dalvik.ipa.callgraph.androidModel;
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/AndroidModelParameterManager.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/AndroidModelParameterManager.java
index ae51abcaa..6caf6058d 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/AndroidModelParameterManager.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/AndroidModelParameterManager.java
@@ -62,7 +62,7 @@ import com.ibm.wala.util.ssa.SSAValue;
  *
  *  @see com.ibm.wala.dalvik.ipa.callgraph.androidModel.structure.AbstractAndroidModel
  *
- *  @author  Tobias Blaschke 
+ *  @author  Tobias Blaschke <code@toiasblaschke.de>
  *  @since   2013-09-19
  *
  *  TODO:
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/DefaultInstantiationBehavior.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/DefaultInstantiationBehavior.java
index c0894fa4b..fc16ce460 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/DefaultInstantiationBehavior.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/DefaultInstantiationBehavior.java
@@ -57,7 +57,7 @@ import com.ibm.wala.util.strings.Atom;
 /**
  *  Contains some predefined behaviors.
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  *  @since  2013-10-25
  */
 public class DefaultInstantiationBehavior extends IInstantiationBehavior {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/FlatInstantiator.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/FlatInstantiator.java
index 7dde3556f..13b267bee 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/FlatInstantiator.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/FlatInstantiator.java
@@ -80,7 +80,7 @@ import com.ibm.wala.util.ssa.TypeSafeInstructionFactory;
  *
  *  This variant limits recursion depth.
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  */
 public class FlatInstantiator implements IInstantiator {
     private static final Logger logger = LoggerFactory.getLogger(FlatInstantiator.class);
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/IInstantiationBehavior.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/IInstantiationBehavior.java
index ca4a7cda2..c9d8d6f4c 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/IInstantiationBehavior.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/IInstantiationBehavior.java
@@ -48,7 +48,7 @@ import com.ibm.wala.types.TypeName;
 
 /**
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  */
 public abstract class IInstantiationBehavior implements Serializable {
 	private static final long serialVersionUID = -3698760758700891479L;
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/Instantiator.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/Instantiator.java
index e983291d2..fc7eb7e6b 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/Instantiator.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/Instantiator.java
@@ -84,7 +84,7 @@ import com.ibm.wala.util.strings.Atom;
  *
  *  Creates an instance of (hopefully) anything.
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  */
 public class Instantiator implements IInstantiator {
     private static final Logger logger = LoggerFactory.getLogger(Instantiator.class);
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/LoadedInstantiationBehavior.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/LoadedInstantiationBehavior.java
index 6e2fe3acb..8ebe8c7af 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/LoadedInstantiationBehavior.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/LoadedInstantiationBehavior.java
@@ -57,7 +57,7 @@ import com.ibm.wala.util.strings.Atom;
  *
  *  This class generates an empty mutable IInstantiationBehavior.
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  *  @since  2013-10-25
  */
 public class LoadedInstantiationBehavior extends IInstantiationBehavior {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/ReuseParameters.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/ReuseParameters.java
index 9efeccc89..94c31586d 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/ReuseParameters.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/ReuseParameters.java
@@ -75,7 +75,7 @@ import com.ibm.wala.util.strings.Atom;
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.androidModel.parameters.IInstantiationBehavior
  *  @see    com.ibm.wala.util.ssa.ParameterAccessor 
  *  
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  *  @since  2013-11-02
  */
 public class ReuseParameters {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/SpecializedInstantiator.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/SpecializedInstantiator.java
index 2d49531d3..cad4ad8fe 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/SpecializedInstantiator.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/SpecializedInstantiator.java
@@ -72,7 +72,7 @@ import com.ibm.wala.util.ssa.TypeSafeInstructionFactory;
  *  For example instantiating an android.content.Context would pull in all Android-components in
  *  scope resulting in a massivly overapproximated model.
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  */
 public class SpecializedInstantiator extends FlatInstantiator {
 
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/package-info.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/package-info.java
index 2365f6321..73fb5efe7 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/package-info.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/parameters/package-info.java
@@ -47,6 +47,6 @@
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.androidModel.parameters.IInstantiationBehavior
  *
  *  @since  2013-10-25
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  */
 package com.ibm.wala.dalvik.ipa.callgraph.androidModel.parameters;
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/AbstractAndroidModel.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/AbstractAndroidModel.java
index d9460e0d0..07dd3903d 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/AbstractAndroidModel.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/AbstractAndroidModel.java
@@ -71,7 +71,7 @@ import com.ibm.wala.util.ssa.TypeSafeInstructionFactory;
  *  @see        com.ibm.wala.dalvik.ipa.callgraph.impl.AndroidEntryPoint.ExecutionOrder
  *  @see        com.ibm.wala.dalvik.ipa.callgraph.androidModel.parameters.AndroidModelParameterManager
  *
- *  @author     Tobias Blaschke 
+ *  @author     Tobias Blaschke <code@tobiasblaschke.de>
  *  @since      2013-09-07
  */
 public abstract class AbstractAndroidModel  {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/LoopAndroidModel.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/LoopAndroidModel.java
index 96114819d..9862da782 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/LoopAndroidModel.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/LoopAndroidModel.java
@@ -74,7 +74,7 @@ import com.ibm.wala.util.ssa.TypeSafeInstructionFactory;
  *  restart of the Application (instance-state) or when the potential restart of the App
  *  shall be ignored.
  *
- *  @author     Tobias Blaschke 
+ *  @author     Tobias Blaschke <code@tobiasblaschke.de>
  */
 public class LoopAndroidModel extends SingleStartAndroidModel {
     private static final Logger logger = LoggerFactory.getLogger(LoopAndroidModel.class);
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/LoopKillAndroidModel.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/LoopKillAndroidModel.java
index e9152810c..6e2a5c284 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/LoopKillAndroidModel.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/LoopKillAndroidModel.java
@@ -72,7 +72,7 @@ import com.ibm.wala.util.ssa.TypeSafeInstructionFactory;
  *  needed again they get started using that savedIstanceState.
  *
  *  @see        com.ibm.wala.dalvik.ipa.callgraph.androidModel.structure.LoopAndroidModel
- *  @author     Tobias Blaschke 
+ *  @author     Tobias Blaschke <code@tobiasblaschke.de>
  */
 public class LoopKillAndroidModel extends LoopAndroidModel {
     private static final Logger logger = LoggerFactory.getLogger(LoopKillAndroidModel.class);
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/SequentialAndroidModel.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/SequentialAndroidModel.java
index 125b18738..fab158a9f 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/SequentialAndroidModel.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/SequentialAndroidModel.java
@@ -53,7 +53,7 @@ import com.ibm.wala.util.ssa.TypeSafeInstructionFactory;
  *  This model should not be particular useful in practice. However it might come in
  *  handy for debugging purposes or as a skeleton for an other Model.
  *
- *  @author     Tobias Blaschke 
+ *  @author     Tobias Blaschke <code@tobiasblaschke.de>
  *  @since      2013-09-18
  */
 public final class SequentialAndroidModel extends AbstractAndroidModel {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/SingleStartAndroidModel.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/SingleStartAndroidModel.java
index 6c5902617..3f8902e12 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/SingleStartAndroidModel.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/SingleStartAndroidModel.java
@@ -73,7 +73,7 @@ import com.ibm.wala.util.ssa.TypeSafeInstructionFactory;
  *
  *  @see        com.ibm.wala.dalvik.ipa.callgraph.androidModel.structure.LoopAndroidModel
  *  @see        com.ibm.wala.dalvik.ipa.callgraph.androidModel.structure.LoopKillAndroidModel
- *  @author     Tobias Blaschke 
+ *  @author     Tobias Blaschke <code@tobiasblaschke.de>
  */
 public class SingleStartAndroidModel extends AbstractAndroidModel {
     private static final Logger logger = LoggerFactory.getLogger(SingleStartAndroidModel.class);
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/package-info.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/package-info.java
index aa3f83618..58a7cc137 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/package-info.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/structure/package-info.java
@@ -48,6 +48,6 @@
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.androidModel.structure.AbstractAndroidModel
  *
  *  @since  2013-10-25
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  */
 package com.ibm.wala.dalvik.ipa.callgraph.androidModel.structure;
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/AndroidBoot.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/AndroidBoot.java
index c9d31c56e..4e93419cd 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/AndroidBoot.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/AndroidBoot.java
@@ -70,7 +70,7 @@ import com.ibm.wala.util.strings.Atom;
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.androidModel.AndroidModel
  *  @see    com.ibm.wala.dalvik.util.AndroidEntryPointManager
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  *  @since  2013-10-23
  */
 public class AndroidBoot {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/AndroidStartComponentTool.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/AndroidStartComponentTool.java
index a60195d82..f3144dba3 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/AndroidStartComponentTool.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/AndroidStartComponentTool.java
@@ -76,7 +76,7 @@ import com.ibm.wala.util.strings.Atom;
  *
  *  This class is only used by AndroidModel.getMethodAs() as it got a bit lengthy.
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  *  @since  2013-10-22
  */
 public class AndroidStartComponentTool {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/ExternalModel.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/ExternalModel.java
index 23e7704e8..49b9f2a8f 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/ExternalModel.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/ExternalModel.java
@@ -78,7 +78,7 @@ import com.ibm.wala.util.strings.Atom;
  *
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentContextInterpreter
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  *  @since  2013-10-15
  */
 public class ExternalModel extends AndroidModel {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/Overrides.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/Overrides.java
index 1a4168452..1abc2d4f2 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/Overrides.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/Overrides.java
@@ -73,7 +73,7 @@ import com.ibm.wala.util.collections.HashMapFactory;
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentStarters
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  *  @since  2013-10-28
  */
 public class Overrides {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/SystemServiceModel.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/SystemServiceModel.java
index 7a7fa22e7..8fa70aed2 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/SystemServiceModel.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/SystemServiceModel.java
@@ -77,7 +77,7 @@ import com.ibm.wala.util.strings.Atom;
  *
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentContextInterpreter
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  *  @since  2013-10-15
  */
 public class SystemServiceModel extends AndroidModel {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/UnknownTargetModel.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/UnknownTargetModel.java
index b0818b5f1..f50a66868 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/UnknownTargetModel.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/UnknownTargetModel.java
@@ -83,7 +83,7 @@ import com.ibm.wala.util.strings.Atom;
  *
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentContextInterpreter
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  *  @since  2013-10-18
  */
 public class UnknownTargetModel  extends AndroidModel {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/package-info.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/package-info.java
index 3fcc156fa..241d42e01 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/package-info.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/androidModel/stubs/package-info.java
@@ -51,6 +51,6 @@
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa 
  *
  *  @since  2013-10-25
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  */
 package com.ibm.wala.dalvik.ipa.callgraph.androidModel.stubs;
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/AndroidEntryPoint.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/AndroidEntryPoint.java
index 3e0545fd9..782cdbcfa 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/AndroidEntryPoint.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/impl/AndroidEntryPoint.java
@@ -59,7 +59,7 @@ import com.ibm.wala.util.strings.Atom;
  *
  *  @see    com.ibm.wala.dalvik.util.AndroidEntryPointLocator
  *
- *  @author  Tobias Blaschke 
+ *  @author  Tobias Blaschke <code@toiasblaschke.de>
  *  @since   2013-09-01
  */
 public class AndroidEntryPoint extends DexEntryPoint {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/AndroidContext.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/AndroidContext.java
index 1b93e9c0b..096bcfddc 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/AndroidContext.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/AndroidContext.java
@@ -48,7 +48,7 @@ import com.ibm.wala.ipa.callgraph.ContextKey;
 /**
  *  Fetches an android/content/Context.
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  *  @since  2013-10-14
  */
 public class AndroidContext implements Context {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/Intent.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/Intent.java
index e764f635f..0270e0d3e 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/Intent.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/Intent.java
@@ -68,7 +68,7 @@ import com.ibm.wala.util.strings.Atom;
  * @see     com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentContextSelector
  * @see     com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentContextInterpreter
  *
- * @author  Tobias Blaschke 
+ * @author  Tobias Blaschke <code@tobiasblaschke.de>
  * @since   2013-10-12
  */
 public class Intent implements ContextItem, Comparable {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContext.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContext.java
index 5508715db..e48874dc4 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContext.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContext.java
@@ -49,7 +49,7 @@ import com.ibm.wala.ipa.callgraph.ContextKey;
  *
  *  This class takes a parent so we don't loose information by overwriting.
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  *  @since  2013-10-14
  */
 public class IntentContext implements Context {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContextInterpreter.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContextInterpreter.java
index d26085eaa..6c7d90c69 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContextInterpreter.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContextInterpreter.java
@@ -91,7 +91,7 @@ import com.ibm.wala.util.CancelException;
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.androidModel.MicroModel
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.androidModel.stubs.ExternalModel
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  *  @since  2013-10-14
  */
 public class IntentContextInterpreter implements SSAContextInterpreter {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContextSelector.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContextSelector.java
index 071be115c..5353c6bd9 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContextSelector.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentContextSelector.java
@@ -70,7 +70,7 @@ import com.ibm.wala.util.intset.IntSetUtil;
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentContextInterpreter
  *  @see    com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.IntentStarters
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  *  @since  2013-10-14
  */
 public class IntentContextSelector implements ContextSelector {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentMap.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentMap.java
index 4bfe98ca3..9cb565756 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentMap.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentMap.java
@@ -54,7 +54,7 @@ import com.ibm.wala.util.strings.StringStuff;
  *
  *  This class is only of use in conjunction with the IntentContextSelector
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  */
 /*package*/ class IntentMap {
     private final Map seen = new HashMap<>();
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentStarters.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentStarters.java
index 4d554b46b..0f7658be7 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentStarters.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/IntentStarters.java
@@ -63,7 +63,7 @@ import com.ibm.wala.util.collections.HashMapFactory;
  * TODO:
  * @todo    Fill in better values for targetAccuracy and componentType
  * @todo    Add declaring class
- * @author  Tobias Blaschke 
+ * @author  Tobias Blaschke <code@tobiasblaschke.de>
  * @since   1013-10-16
  */
 public class IntentStarters {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/package-info.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/package-info.java
index 0ded181de..7dd5127f0 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/package-info.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ipa/callgraph/propagation/cfa/package-info.java
@@ -64,6 +64,6 @@
  * @see     com.ibm.wala.dalvik.ipa.callgraph.androidModel.MicroModel 
  * @see     com.ibm.wala.dalvik.ipa.callgraph.androidModel.stubs.UnknownTargetModel
  * @see     com.ibm.wala.dalvik.ipa.callgraph.androidModel.stubs.ExternalModel
- * @author  Tobias Blaschke 
+ * @author  Tobias Blaschke <code@tobiasblaschke.de>
  */
 package com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa;
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ssa/DexSSABuilder.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ssa/DexSSABuilder.java
index b3516d437..f7a3b1986 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ssa/DexSSABuilder.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/ssa/DexSSABuilder.java
@@ -113,7 +113,7 @@ public class DexSSABuilder extends AbstractIntRegisterMachine {
     final private SymbolTable symbolTable;
 
     /**
-     * A logical mapping from  -> local number if null, don't build it.
+     * A logical mapping from <bcIndex, valueNumber> -> local number if null, don't build it.
      */
     private final SSA2LocalMap localMap;
 
@@ -1378,7 +1378,7 @@ public class DexSSABuilder extends AbstractIntRegisterMachine {
     }
 
     /**
-     * A logical mapping from  -> local number Note: make sure this class remains static: this persists as part of
+     * A logical mapping from <pc, valueNumber> -> local number Note: make sure this class remains static: this persists as part of
      * the IR!!
      */
     private static class SSA2LocalMap implements com.ibm.wala.ssa.IR.SSA2LocalMap {
@@ -1386,7 +1386,7 @@ public class DexSSABuilder extends AbstractIntRegisterMachine {
         private final DexCFG dexCFG;
 
         /**
-         * Mapping Integer -> IntPair where p maps to (vn,L) iff we've started a range at pc p where value number vn corresponds to
+         * Mapping Integer -> IntPair where p maps to (vn,L) iff we've started a range at pc p where value number vn corresponds to
          * local L
          */
         private final IntPair[] localStoreMap;
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidComponent.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidComponent.java
index 7e55dac90..66b662870 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidComponent.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidComponent.java
@@ -50,7 +50,7 @@ import com.ibm.wala.util.strings.StringStuff;
 /**
  *  Android Components like Activity, Service, ...
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  *  @since  2013-10-16
  */
 public enum AndroidComponent {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidEntryPointLocator.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidEntryPointLocator.java
index a2260cffd..1455e3ea1 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidEntryPointLocator.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidEntryPointLocator.java
@@ -78,7 +78,7 @@ import com.ibm.wala.util.config.SetOfClasses;
  *  Iterates the ClassHierarchy matching its elements to a set of hardcoded entrypoint-specifications.
  *  Then optionally uses heuristics to select further entrypoints.
  *
- *  @author     Tobias Blaschke 
+ *  @author     Tobias Blaschke <code@tobiasblaschke.de>
  */
 public final class AndroidEntryPointLocator {
     private static final Logger logger = LoggerFactory.getLogger(AndroidEntryPointLocator.class);
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidEntryPointManager.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidEntryPointManager.java
index d1fd4c98e..bc0bbb6e7 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidEntryPointManager.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidEntryPointManager.java
@@ -76,7 +76,7 @@ import com.ibm.wala.util.strings.StringStuff;
  *
  *  See the single settings for further description.
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  */
 public final /* singleton */ class AndroidEntryPointManager implements Serializable {
     private static final Logger logger = LoggerFactory.getLogger(AndroidEntryPointManager.class);
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java
index 9a277220f..bf0763c02 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidManifestXMLReader.java
@@ -85,7 +85,7 @@ import com.ibm.wala.dalvik.ipa.callgraph.propagation.cfa.Intent;
  * TODO:
  * @todo    Handle Info in the DATA-Tag correctly!
  * @since   2013-10-13
- * @author  Tobias Blaschke 
+ * @author  Tobias Blaschke <code@tobiasblaschke.de>
  */
 public class AndroidManifestXMLReader {
     /**
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidPreFlightChecks.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidPreFlightChecks.java
index b318357ed..82b9dfe0b 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidPreFlightChecks.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidPreFlightChecks.java
@@ -59,7 +59,7 @@ import com.ibm.wala.types.TypeReference;
  *
  *  These checks may be run before building the CallGraph to verify everything is in place.
  *
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  *  @since  2013-11-01
  */
 public class AndroidPreFlightChecks {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidSettingFactory.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidSettingFactory.java
index 181c4c2d4..0c1320b85 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidSettingFactory.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidSettingFactory.java
@@ -50,7 +50,7 @@ import com.ibm.wala.util.strings.StringStuff;
  *  This is for use by a parser to generate the Objects to place in the AndroidEntryPointManager.
  *
  *  @see    AndroidManifestXMLReader
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  *  @since  2013-10-14
  */
 public class AndroidSettingFactory {
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidTypes.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidTypes.java
index 4c94f7941..0a3b11110 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidTypes.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/AndroidTypes.java
@@ -47,7 +47,7 @@ import com.ibm.wala.types.TypeReference;
 /**
  *  Constants for types used by the AndroidModel
  *
- *  @author     Tobias Blaschke 
+ *  @author     Tobias Blaschke <code@tobiasblaschke.de>
  */
 public final class AndroidTypes {
 
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ActivityEP.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ActivityEP.java
index 7086cfc9f..d035b501f 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ActivityEP.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ActivityEP.java
@@ -52,7 +52,7 @@ import com.ibm.wala.dalvik.util.AndroidEntryPointLocator.AndroidPossibleEntryPoi
  *  The specifications are read and handled by AndroidEntryPointLocator.
  *
  *  @see    com.ibm.wala.dalvik.util.AndroidEntryPointLocator
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  */
 public final class ActivityEP {
 	// see: http://developer.android.com/reference/android/app/Activity.html
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ApplicationEP.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ApplicationEP.java
index cc1a541a9..04c627e9f 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ApplicationEP.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ApplicationEP.java
@@ -53,7 +53,7 @@ import com.ibm.wala.dalvik.util.AndroidEntryPointLocator.AndroidPossibleEntryPoi
  *  see: http://developer.android.com/reference/android/app/Application.html
  *
  *  @see    com.ibm.wala.dalvik.util.AndroidEntryPointLocator
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  */
 public final class ApplicationEP {
 
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/FragmentEP.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/FragmentEP.java
index 94a4a2dd7..76b44782f 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/FragmentEP.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/FragmentEP.java
@@ -53,7 +53,7 @@ import com.ibm.wala.dalvik.util.AndroidEntryPointLocator.AndroidPossibleEntryPoi
  *  https://developer.android.com/reference/android/app/Fragment.html
  *
  *  @see    com.ibm.wala.dalvik.util.AndroidEntryPointLocator
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  */
 public final class FragmentEP {
 
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/LoaderCB.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/LoaderCB.java
index d4b6037a1..65cdde4a6 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/LoaderCB.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/LoaderCB.java
@@ -52,7 +52,7 @@ import com.ibm.wala.dalvik.util.AndroidEntryPointLocator.AndroidPossibleEntryPoi
  *  AndroidEntryPointLocator are set to include call-backs.
  *
  *  @see    com.ibm.wala.dalvik.util.AndroidEntryPointLocator
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  */
 public final class LoaderCB {
     
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/LocationEP.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/LocationEP.java
index ee430edeb..3b5d7491c 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/LocationEP.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/LocationEP.java
@@ -52,7 +52,7 @@ import com.ibm.wala.dalvik.util.AndroidEntryPointLocator.AndroidPossibleEntryPoi
  *  AndroidEntryPointLocator are set to include call-backs.
  *  
  *  @see    com.ibm.wala.dalvik.util.AndroidEntryPointLocator
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  */
 public final class LocationEP {
 	public static final AndroidPossibleEntryPoint onLocationChanged = new AndroidPossibleEntryPoint("onLocationChanged", ExecutionOrder.MIDDLE_OF_LOOP);
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ProviderEP.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ProviderEP.java
index e48e3cb39..f99e59379 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ProviderEP.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ProviderEP.java
@@ -52,7 +52,7 @@ import com.ibm.wala.dalvik.util.AndroidEntryPointLocator.AndroidPossibleEntryPoi
  *  The specifications are read and handled by AndroidEntryPointLocator.
  *
  *  @see    com.ibm.wala.dalvik.util.AndroidEntryPointLocator
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  */
 public final class ProviderEP {
 	public static final AndroidPossibleEntryPoint onCreate = new AndroidPossibleEntryPoint("onCreate", ExecutionOrder.AT_FIRST);
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ServiceEP.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ServiceEP.java
index 91548c5a4..576970598 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ServiceEP.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/ServiceEP.java
@@ -52,7 +52,7 @@ import com.ibm.wala.dalvik.util.AndroidEntryPointLocator.AndroidPossibleEntryPoi
  *  The specifications are read and handled by AndroidEntryPointLocator.
  *
  *  @see    com.ibm.wala.dalvik.util.AndroidEntryPointLocator
- *  @author Tobias Blaschke 
+ *  @author Tobias Blaschke <code@tobiasblaschke.de>
  */
 public final class ServiceEP {
     /**
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/package-info.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/package-info.java
index af10bd32c..363a3e126 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/package-info.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/androidEntryPoints/package-info.java
@@ -52,6 +52,6 @@
  * adapted to load the specifications.
  *
  * @see    com.ibm.wala.dalvik.util.AndroidEntryPointLocator
- * @author Tobias Blaschke 
+ * @author Tobias Blaschke <code@tobiasblaschke.de>
  */
 package com.ibm.wala.dalvik.util.androidEntryPoints;
diff --git a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/package-info.java b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/package-info.java
index 4ce2211b8..53e60aace 100644
--- a/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/package-info.java
+++ b/com.ibm.wala.dalvik/src/com/ibm/wala/dalvik/util/package-info.java
@@ -44,6 +44,6 @@
  * These include mainly locationg and managing EntryPoints. The model howver is
  * built in the androidModel-Package.
  *
- * @author Tobias Blaschke 
+ * @author Tobias Blaschke <code@tobiasblaschke.de>
  */
 package com.ibm.wala.dalvik.util;
diff --git a/com.ibm.wala.scandroid/source/org/scandroid/model/AppModelMethod.java b/com.ibm.wala.scandroid/source/org/scandroid/model/AppModelMethod.java
index a9270a2cc..14ef3a81c 100644
--- a/com.ibm.wala.scandroid/source/org/scandroid/model/AppModelMethod.java
+++ b/com.ibm.wala.scandroid/source/org/scandroid/model/AppModelMethod.java
@@ -89,7 +89,7 @@ public class AppModelMethod {
 	
 	int nextLocal;
     /**
-     * A mapping from String (variable name) -> Integer (local number)
+     * A mapping from String (variable name) -> Integer (local number)
      */
     private Map symbolTable = null;
     
diff --git a/com.ibm.wala.scandroid/source/org/scandroid/synthmethod/SSAtoXMLVisitor.java b/com.ibm.wala.scandroid/source/org/scandroid/synthmethod/SSAtoXMLVisitor.java
index 217faa4fc..f28a4c813 100644
--- a/com.ibm.wala.scandroid/source/org/scandroid/synthmethod/SSAtoXMLVisitor.java
+++ b/com.ibm.wala.scandroid/source/org/scandroid/synthmethod/SSAtoXMLVisitor.java
@@ -461,7 +461,7 @@ public class SSAtoXMLVisitor implements SSAInstruction.IVisitor {
      * local name associated with it) then this will throw an illegal state
      * exception.
      *
-     * TODO needs to return 'arg0' -> 'argN' for those value numbers...
+     * TODO needs to return 'arg0' -> 'argN' for those value numbers...
      *
      * @param defNum
      *
diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/DupInstruction.java b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/DupInstruction.java
index ece21fbed..0ce56c653 100644
--- a/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/DupInstruction.java
+++ b/com.ibm.wala.shrike/src/com/ibm/wala/shrikeBT/DupInstruction.java
@@ -13,7 +13,7 @@ package com.ibm.wala.shrikeBT;
 /**
  * This class represents dup instructions. There are two kinds of dup instructions, dup and dup_x1:
  * 
- * dup: a::rest => a::a::rest dup_x1: a::b::rest => a::b::a::rest
+ * dup: a::rest => a::a::rest dup_x1: a::b::rest => a::b::a::rest
  */
 public final class DupInstruction extends Instruction {
   final private int size;
diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTData.java b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTData.java
index 9ba1c4884..7054c206f 100644
--- a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTData.java
+++ b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTData.java
@@ -25,7 +25,7 @@ import com.ibm.wala.sourcepos.InvalidRangeException.Cause;
  * @see CRTFlags
  * @see CRTable
  * @author Siegfried Weber
- * @author Juergen Graf 
+ * @author Juergen Graf <juergen.graf@gmail.com>
  */
 public final class CRTData {
 
diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTFlags.java b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTFlags.java
index 6142b6817..a4377f810 100644
--- a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTFlags.java
+++ b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTFlags.java
@@ -26,7 +26,7 @@ import java.util.LinkedList;
  * @see CRTData
  * @see CRTable
  * @author Siegfried Weber
- * @author Juergen Graf 
+ * @author Juergen Graf <juergen.graf@gmail.com>
  */
 public final class CRTFlags {
 
diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTable.java b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTable.java
index e3ac2e63a..d29dfddb8 100644
--- a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTable.java
+++ b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/CRTable.java
@@ -27,7 +27,7 @@ import java.util.LinkedList;
  * @see CRTData
  * @see CRTFlags
  * @author Siegfried Weber
- * @author Juergen Graf 
+ * @author Juergen Graf <juergen.graf@gmail.com>
  */
 public final class CRTable extends PositionsAttribute {
 
diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/Debug.java b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/Debug.java
index 39e972993..700a4ea02 100644
--- a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/Debug.java
+++ b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/Debug.java
@@ -23,7 +23,7 @@ import java.util.Map;
 import java.util.Set;
 
 /**
- * @author Juergen Graf 
+ * @author Juergen Graf <juergen.graf@gmail.com>
  * 
  */
 public final class Debug {
diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidCRTDataException.java b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidCRTDataException.java
index 7ad4855ce..976ffcdaa 100644
--- a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidCRTDataException.java
+++ b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidCRTDataException.java
@@ -26,7 +26,7 @@ import java.util.LinkedList;
  * @see CRTData
  * @see CRTFlags
  * @author Siegfried Weber
- * @author Juergen Graf 
+ * @author Juergen Graf <juergen.graf@gmail.com>
  */
 class InvalidCRTDataException extends Exception {
 
diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidPositionException.java b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidPositionException.java
index 3be0a760d..635d06d9e 100644
--- a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidPositionException.java
+++ b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidPositionException.java
@@ -21,7 +21,7 @@ package com.ibm.wala.sourcepos;
  * An exception for invalid positions.
  * 
  * @author Siegfried Weber
- * @author Juergen Graf 
+ * @author Juergen Graf <juergen.graf@gmail.com>
  */
 class InvalidPositionException extends Exception {
 
diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidRangeException.java b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidRangeException.java
index 75062879b..ee32bc225 100644
--- a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidRangeException.java
+++ b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidRangeException.java
@@ -21,7 +21,7 @@ package com.ibm.wala.sourcepos;
  * An exception for invalid ranges.
  * 
  * @author Siegfried Weber
- * @author Juergen Graf 
+ * @author Juergen Graf <juergen.graf@gmail.com>
  */
 class InvalidRangeException extends Exception {
 
diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidSourceInfoException.java b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidSourceInfoException.java
index cc49d02ed..12be53a5a 100644
--- a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidSourceInfoException.java
+++ b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/InvalidSourceInfoException.java
@@ -23,7 +23,7 @@ package com.ibm.wala.sourcepos;
  * CharacterRangeTable.
  * 
  * @author Siegfried Weber
- * @author Juergen Graf 
+ * @author Juergen Graf <juergen.graf@gmail.com>
  */
 public class InvalidSourceInfoException extends Exception {
 
diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/MethodPositions.java b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/MethodPositions.java
index 8d3175e43..cebf55a98 100644
--- a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/MethodPositions.java
+++ b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/MethodPositions.java
@@ -26,7 +26,7 @@ import com.ibm.wala.sourcepos.InvalidRangeException.Cause;
  * This class represents the MethodPositions attribute.
  * 
  * @author Siegfried Weber
- * @author Juergen Graf 
+ * @author Juergen Graf <juergen.graf@gmail.com>
  */
 public final class MethodPositions extends PositionsAttribute {
 
diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/Position.java b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/Position.java
index 7e2fb7246..fa8e34eb9 100644
--- a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/Position.java
+++ b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/Position.java
@@ -22,7 +22,7 @@ package com.ibm.wala.sourcepos;
  * format: {@code line-number << LINESHIFT + column-number}
  * 
  * @author Siegfried Weber
- * @author Juergen Graf 
+ * @author Juergen Graf <juergen.graf@gmail.com>
  */
 public final class Position {
 
diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/PositionsAttribute.java b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/PositionsAttribute.java
index 3651b93a4..cb33fa47d 100644
--- a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/PositionsAttribute.java
+++ b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/PositionsAttribute.java
@@ -25,7 +25,7 @@ import java.io.IOException;
  * This is the super class of all position attributes.
  * 
  * @author Siegfried Weber
- * @author Juergen Graf 
+ * @author Juergen Graf <juergen.graf@gmail.com>
  */
 abstract class PositionsAttribute {
 
diff --git a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/Range.java b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/Range.java
index 8ef02bff1..17e96c840 100644
--- a/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/Range.java
+++ b/com.ibm.wala.shrike/src/com/ibm/wala/sourcepos/Range.java
@@ -21,7 +21,7 @@ package com.ibm.wala.sourcepos;
  * This class represents a range in the source file.
  * 
  * @author Siegfried Weber
- * @author Juergen Graf 
+ * @author Juergen Graf <juergen.graf@gmail.com>
  */
 public class Range {
 
diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/graph/dominators/Dominators.java b/com.ibm.wala.util/src/com/ibm/wala/util/graph/dominators/Dominators.java
index f879f9b7f..ff56998dd 100644
--- a/com.ibm.wala.util/src/com/ibm/wala/util/graph/dominators/Dominators.java
+++ b/com.ibm.wala.util/src/com/ibm/wala/util/graph/dominators/Dominators.java
@@ -352,7 +352,7 @@ public abstract class Dominators {
   /**
    * This method inspects the passed node and returns the following: node, if node is a root of a tree in the forest
    * 
-   * any vertex, u != r such that otherwise r is the root of the tree containing node and * semi(u) is minimum on the path r -> v
+   * any vertex, u != r such that otherwise r is the root of the tree containing node and * semi(u) is minimum on the path r -> v
    * 
    * See TOPLAS 1(1), July 1979, p 128 for details.
    * 
diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/BoundedBFSIterator.java b/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/BoundedBFSIterator.java
index 531d457b1..aa176febe 100644
--- a/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/BoundedBFSIterator.java
+++ b/com.ibm.wala.util/src/com/ibm/wala/util/graph/traverse/BoundedBFSIterator.java
@@ -55,7 +55,7 @@ public class BoundedBFSIterator implements Iterator {
   private final int k;
 
   /**
-   * boundary[i] is the first index which represents a child that is > i hops away.
+   * boundary[i] is the first index which represents a child that is > i hops away.
    */
   private final int[] boundary;
 
diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/heapTrace/HeapTracer.java b/com.ibm.wala.util/src/com/ibm/wala/util/heapTrace/HeapTracer.java
index f2a8bb146..cd0aa669a 100644
--- a/com.ibm.wala.util/src/com/ibm/wala/util/heapTrace/HeapTracer.java
+++ b/com.ibm.wala.util/src/com/ibm/wala/util/heapTrace/HeapTracer.java
@@ -69,7 +69,7 @@ public class HeapTracer {
     private final boolean traceStatics;
 
     /**
-     * Map: Class -> Integer, the size of each class
+     * Map: Class -> Integer, the size of each class
      */
     private final HashMap, Integer> sizeMap = HashMapFactory.make();
 
@@ -627,13 +627,13 @@ public class HeapTracer {
      */
     class Demographics {
 	/**
-	 * mapping: Object (key) -> Integer (number of instances in a partition)
+	 * mapping: Object (key) -> Integer (number of instances in a partition)
 	 */
 	private final HashMap instanceCount = HashMapFactory
 		.make();
 
 	/**
-	 * mapping: Object (key) -> Integer (bytes)
+	 * mapping: Object (key) -> Integer (bytes)
 	 */
 	private final HashMap sizeCount = HashMapFactory
 		.make();
@@ -725,7 +725,7 @@ public class HeapTracer {
     public class Result {
 
 	/**
-	 * a mapping from Field (static field roots) -> Demographics object
+	 * a mapping from Field (static field roots) -> Demographics object
 	 */
 	private final HashMap roots = HashMapFactory
 		.make();
diff --git a/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntegerUnionFind.java b/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntegerUnionFind.java
index fb8b47296..02296e9ff 100644
--- a/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntegerUnionFind.java
+++ b/com.ibm.wala.util/src/com/ibm/wala/util/intset/IntegerUnionFind.java
@@ -23,8 +23,8 @@ public class IntegerUnionFind {
    * 
    * parent[i+1] =
    * 
          
-   * 
        • j > 0 if i is in the same equiv class as j
-   * 
        • j <= 0 if i is the representative of a class of size -(j)+1
+   * <li>j > 0 if i is in the same equiv class as j
+   * 
        • j <= 0 if i is the representative of a class of size -(j)+1
    * 
        
    * 
    * we initialize parent[j] = 0, so each element is a class of size 1