diff --git a/build.xml b/build.xml
index d74e5743612564f215b20263b25b4111a8d77190..766d1a6c581997eef63856e2a17c69c590fbe991 100644
--- a/build.xml
+++ b/build.xml
@@ -83,6 +83,7 @@
 
 			<fileset dir="${src.dir}" defaultexcludes="yes">
 				<include name="**/*.java" />
+				<exclude name="**/Scratch*.java" />
 			</fileset>
 
 			<link href="http://docs.oracle.com/javase/7/docs/api/" />
@@ -91,6 +92,12 @@
 			<link href="http://google.github.io/gson/apidocs/" />
 
 		</javadoc>
+		
+		<!-- Copy images -->
+		<copy todir="${javadoc.dir}/resources">
+			<fileset dir="etc/resources/docs" includes="*.jpg" />
+		</copy>
+		
 	</target>
 
 </project>
diff --git a/src/org/opensha2/calc/Site.java b/src/org/opensha2/calc/Site.java
index 2989469be27623cd87b984fe34720c16cc83c0ed..49cd9ea753b6aea09931ffb1320c71374e82d525 100644
--- a/src/org/opensha2/calc/Site.java
+++ b/src/org/opensha2/calc/Site.java
@@ -229,10 +229,13 @@ public class Site implements Named {
 
 	}
 
+	private static final int MAX_NAME_LENGTH = 72;
+	
 	private static String cleanName(String name) {
-		return name.replaceAll(",", "").substring(0, 72);
+		name = name.replaceAll(",", "");
+		return name.length() > MAX_NAME_LENGTH ? name.substring(0, MAX_NAME_LENGTH) : name;
 	}
-
+	
 	/* Json and csv serialization keys */
 	static final class Key {
 		static final String NAME = "name";
diff --git a/src/org/opensha2/eq/fault/scaling/MagAreaRelDepthDep.java b/src/org/opensha2/eq/fault/scaling/MagAreaRelDepthDep.java
index 49760d864cc5ed4d8c5900e960dd4306ca661812..05f6cf950def969758f5dec8c36d44b78bb00d1f 100644
--- a/src/org/opensha2/eq/fault/scaling/MagAreaRelDepthDep.java
+++ b/src/org/opensha2/eq/fault/scaling/MagAreaRelDepthDep.java
@@ -1,22 +1,3 @@
-/*******************************************************************************
- * Copyright 2009 OpenSHA.org in partnership with
- * the Southern California Earthquake Center (SCEC, http://www.scec.org)
- * at the University of Southern California and the UnitedStates Geological
- * Survey (USGS; http://www.usgs.gov)
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
 package org.opensha2.eq.fault.scaling;
 
 /**
diff --git a/src/org/opensha2/eq/fault/scaling/MagLengthRelationship.java b/src/org/opensha2/eq/fault/scaling/MagLengthRelationship.java
index f682913e25c5f27b4e5297c44dd3a0789dfa3a63..80c67e07e6e88e0a7822666e6be34d7cb103d0f4 100644
--- a/src/org/opensha2/eq/fault/scaling/MagLengthRelationship.java
+++ b/src/org/opensha2/eq/fault/scaling/MagLengthRelationship.java
@@ -1,22 +1,3 @@
-/*******************************************************************************
- * Copyright 2009 OpenSHA.org in partnership with
- * the Southern California Earthquake Center (SCEC, http://www.scec.org)
- * at the University of Southern California and the UnitedStates Geological
- * Survey (USGS; http://www.usgs.gov)
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
 package org.opensha2.eq.fault.scaling;
 
 
diff --git a/src/org/opensha2/eq/fault/scaling/MagScalingRelationship.java b/src/org/opensha2/eq/fault/scaling/MagScalingRelationship.java
index 58b542b5407e8b24194bdab8c3a36a238d8e85a1..e68379acfc1f69c3b36b8e689b6e9bd4faf9092c 100644
--- a/src/org/opensha2/eq/fault/scaling/MagScalingRelationship.java
+++ b/src/org/opensha2/eq/fault/scaling/MagScalingRelationship.java
@@ -1,22 +1,3 @@
-/*******************************************************************************
- * Copyright 2009 OpenSHA.org in partnership with
- * the Southern California Earthquake Center (SCEC, http://www.scec.org)
- * at the University of Southern California and the UnitedStates Geological
- * Survey (USGS; http://www.usgs.gov)
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
 package org.opensha2.eq.fault.scaling;
 
 import org.opensha2.eq.fault.Faults;
diff --git a/src/org/opensha2/eq/fault/scaling/impl/CA_MagAreaRelationship.java b/src/org/opensha2/eq/fault/scaling/impl/CA_MagAreaRelationship.java
index aeb8c63a3cb27734302a341eb4eb31dd3968e6ee..a3873cd6c5d69757bc3c69b450d4d0a38b636dea 100644
--- a/src/org/opensha2/eq/fault/scaling/impl/CA_MagAreaRelationship.java
+++ b/src/org/opensha2/eq/fault/scaling/impl/CA_MagAreaRelationship.java
@@ -1,21 +1,3 @@
-/*******************************************************************************
- * Copyright 2009 OpenSHA.org in partnership with the Southern California
- * Earthquake Center (SCEC, http://www.scec.org) at the University of Southern
- * California and the UnitedStates Geological Survey (USGS; http://www.usgs.gov)
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- ******************************************************************************/
-
 package org.opensha2.eq.fault.scaling.impl;
 
 import org.opensha2.eq.fault.scaling.MagAreaRelationship;
diff --git a/src/org/opensha2/eq/fault/scaling/impl/Ellsworth_A_WG02_MagAreaRel.java b/src/org/opensha2/eq/fault/scaling/impl/Ellsworth_A_WG02_MagAreaRel.java
index 8afe546513152add5281d46ba3cd27e9a48bd511..118d08fba30912dd6c61b66ec5e715578dfd5003 100644
--- a/src/org/opensha2/eq/fault/scaling/impl/Ellsworth_A_WG02_MagAreaRel.java
+++ b/src/org/opensha2/eq/fault/scaling/impl/Ellsworth_A_WG02_MagAreaRel.java
@@ -1,22 +1,3 @@
-/*******************************************************************************
- * Copyright 2009 OpenSHA.org in partnership with
- * the Southern California Earthquake Center (SCEC, http://www.scec.org)
- * at the University of Southern California and the UnitedStates Geological
- * Survey (USGS; http://www.usgs.gov)
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
 package org.opensha2.eq.fault.scaling.impl;
 
 import org.opensha2.eq.fault.scaling.MagAreaRelationship;
diff --git a/src/org/opensha2/eq/fault/scaling/impl/Ellsworth_B_WG02_MagAreaRel.java b/src/org/opensha2/eq/fault/scaling/impl/Ellsworth_B_WG02_MagAreaRel.java
index 9b209000164a49686db0318e7a3abad8c9cf78fe..cb970d63e66ca7d1ee39fe05b9562460f2866e83 100644
--- a/src/org/opensha2/eq/fault/scaling/impl/Ellsworth_B_WG02_MagAreaRel.java
+++ b/src/org/opensha2/eq/fault/scaling/impl/Ellsworth_B_WG02_MagAreaRel.java
@@ -1,22 +1,3 @@
-/*******************************************************************************
- * Copyright 2009 OpenSHA.org in partnership with
- * the Southern California Earthquake Center (SCEC, http://www.scec.org)
- * at the University of Southern California and the UnitedStates Geological
- * Survey (USGS; http://www.usgs.gov)
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
 package org.opensha2.eq.fault.scaling.impl;
 
 import org.opensha2.eq.fault.scaling.MagAreaRelationship;
diff --git a/src/org/opensha2/eq/fault/scaling/impl/HanksBakun2002_MagAreaRel.java b/src/org/opensha2/eq/fault/scaling/impl/HanksBakun2002_MagAreaRel.java
index 61d1eec40dce21d8ba16f8ceb698d2f2c61359ed..a0668ba85ce755b62d10e88c95e675ba384c79c9 100644
--- a/src/org/opensha2/eq/fault/scaling/impl/HanksBakun2002_MagAreaRel.java
+++ b/src/org/opensha2/eq/fault/scaling/impl/HanksBakun2002_MagAreaRel.java
@@ -1,22 +1,3 @@
-/*******************************************************************************
- * Copyright 2009 OpenSHA.org in partnership with
- * the Southern California Earthquake Center (SCEC, http://www.scec.org)
- * at the University of Southern California and the UnitedStates Geological
- * Survey (USGS; http://www.usgs.gov)
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
 package org.opensha2.eq.fault.scaling.impl;
 
 import org.opensha2.eq.fault.scaling.MagAreaRelationship;
diff --git a/src/org/opensha2/eq/fault/scaling/impl/PEER_testsMagAreaRelationship.java b/src/org/opensha2/eq/fault/scaling/impl/PEER_testsMagAreaRelationship.java
index d019fea5e03ebd6579f69a5e5c5e5bfbef3d83ce..f7dbfbb69c0c44a9947de0e8969a3ee7cd9f6767 100644
--- a/src/org/opensha2/eq/fault/scaling/impl/PEER_testsMagAreaRelationship.java
+++ b/src/org/opensha2/eq/fault/scaling/impl/PEER_testsMagAreaRelationship.java
@@ -1,22 +1,3 @@
-/*******************************************************************************
- * Copyright 2009 OpenSHA.org in partnership with
- * the Southern California Earthquake Center (SCEC, http://www.scec.org)
- * at the University of Southern California and the UnitedStates Geological
- * Survey (USGS; http://www.usgs.gov)
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
 package org.opensha2.eq.fault.scaling.impl;
 
 import org.opensha2.eq.fault.scaling.MagAreaRelationship;
diff --git a/src/org/opensha2/eq/fault/scaling/impl/Shaw_2007_MagAreaRel.java b/src/org/opensha2/eq/fault/scaling/impl/Shaw_2007_MagAreaRel.java
index 2b540efa19a179358f5fb80cbdfe7808e1e470b0..4825b57efa54399e5424507d5ca022a903e60f6a 100644
--- a/src/org/opensha2/eq/fault/scaling/impl/Shaw_2007_MagAreaRel.java
+++ b/src/org/opensha2/eq/fault/scaling/impl/Shaw_2007_MagAreaRel.java
@@ -1,22 +1,3 @@
-/*******************************************************************************
- * Copyright 2009 OpenSHA.org in partnership with
- * the Southern California Earthquake Center (SCEC, http://www.scec.org)
- * at the University of Southern California and the UnitedStates Geological
- * Survey (USGS; http://www.usgs.gov)
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
 package org.opensha2.eq.fault.scaling.impl;
 
 import org.opensha2.eq.fault.scaling.MagAreaRelationship;
diff --git a/src/org/opensha2/eq/fault/scaling/impl/Shaw_2009_MagAreaRel.java b/src/org/opensha2/eq/fault/scaling/impl/Shaw_2009_MagAreaRel.java
index a1f82e2e98e58a1b69b38c93fb0a449e71191b5f..3a20d9ec8aa8cddcf32c6f076ca2b2d8298501b1 100644
--- a/src/org/opensha2/eq/fault/scaling/impl/Shaw_2009_MagAreaRel.java
+++ b/src/org/opensha2/eq/fault/scaling/impl/Shaw_2009_MagAreaRel.java
@@ -1,22 +1,3 @@
-/*******************************************************************************
- * Copyright 2009 OpenSHA.org in partnership with
- * the Southern California Earthquake Center (SCEC, http://www.scec.org)
- * at the University of Southern California and the UnitedStates Geological
- * Survey (USGS; http://www.usgs.gov)
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
 package org.opensha2.eq.fault.scaling.impl;
 
 import org.opensha2.eq.fault.scaling.MagAreaRelationship;
diff --git a/src/org/opensha2/eq/fault/scaling/impl/Shaw_2009_ModifiedMagAreaRel.java b/src/org/opensha2/eq/fault/scaling/impl/Shaw_2009_ModifiedMagAreaRel.java
index 026549719acd0e1179b1f41032408b0daafb66aa..e2bbb23aaa50557de075b43ae4b13c24f401b354 100644
--- a/src/org/opensha2/eq/fault/scaling/impl/Shaw_2009_ModifiedMagAreaRel.java
+++ b/src/org/opensha2/eq/fault/scaling/impl/Shaw_2009_ModifiedMagAreaRel.java
@@ -1,22 +1,3 @@
-/*******************************************************************************
- * Copyright 2009 OpenSHA.org in partnership with
- * the Southern California Earthquake Center (SCEC, http://www.scec.org)
- * at the University of Southern California and the UnitedStates Geological
- * Survey (USGS; http://www.usgs.gov)
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
 package org.opensha2.eq.fault.scaling.impl;
 
 import org.opensha2.eq.fault.scaling.MagAreaRelDepthDep;
diff --git a/src/org/opensha2/eq/fault/scaling/impl/Somerville_2006_MagAreaRel.java b/src/org/opensha2/eq/fault/scaling/impl/Somerville_2006_MagAreaRel.java
index f0fc4e2949536350e820329cdbf22bfb457be3e4..177e89df7205211fb7156723f82774593f1fd1b5 100644
--- a/src/org/opensha2/eq/fault/scaling/impl/Somerville_2006_MagAreaRel.java
+++ b/src/org/opensha2/eq/fault/scaling/impl/Somerville_2006_MagAreaRel.java
@@ -1,22 +1,3 @@
-/*******************************************************************************
- * Copyright 2009 OpenSHA.org in partnership with
- * the Southern California Earthquake Center (SCEC, http://www.scec.org)
- * at the University of Southern California and the UnitedStates Geological
- * Survey (USGS; http://www.usgs.gov)
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
 package org.opensha2.eq.fault.scaling.impl;
 
 import org.opensha2.eq.fault.scaling.MagAreaRelationship;
diff --git a/src/org/opensha2/eq/fault/scaling/impl/WC1994_MagAreaRelationship.java b/src/org/opensha2/eq/fault/scaling/impl/WC1994_MagAreaRelationship.java
index 217d5b23e9dff3087e4beb5884049e51cf401e16..9ecf3122cab996ccfffb2e3fa154d94d0e1f7211 100644
--- a/src/org/opensha2/eq/fault/scaling/impl/WC1994_MagAreaRelationship.java
+++ b/src/org/opensha2/eq/fault/scaling/impl/WC1994_MagAreaRelationship.java
@@ -1,22 +1,3 @@
-/*******************************************************************************
- * Copyright 2009 OpenSHA.org in partnership with
- * the Southern California Earthquake Center (SCEC, http://www.scec.org)
- * at the University of Southern California and the UnitedStates Geological
- * Survey (USGS; http://www.usgs.gov)
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
 package org.opensha2.eq.fault.scaling.impl;
 
 import org.opensha2.eq.fault.Faults;
diff --git a/src/org/opensha2/eq/fault/scaling/impl/WC1994_MagLengthRelationship.java b/src/org/opensha2/eq/fault/scaling/impl/WC1994_MagLengthRelationship.java
index e3feb52395c2c8ea99033f6fbc660a53af9eb138..ac2d8632de863b17458717320335d7f7537fe740 100644
--- a/src/org/opensha2/eq/fault/scaling/impl/WC1994_MagLengthRelationship.java
+++ b/src/org/opensha2/eq/fault/scaling/impl/WC1994_MagLengthRelationship.java
@@ -1,22 +1,3 @@
-/*******************************************************************************
- * Copyright 2009 OpenSHA.org in partnership with
- * the Southern California Earthquake Center (SCEC, http://www.scec.org)
- * at the University of Southern California and the UnitedStates Geological
- * Survey (USGS; http://www.usgs.gov)
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
 package org.opensha2.eq.fault.scaling.impl;
 
 import org.opensha2.eq.fault.Faults;
diff --git a/src/org/opensha2/eq/fault/scaling/impl/WGCEP_2007_PowLaw_MagAreaRel.java b/src/org/opensha2/eq/fault/scaling/impl/WGCEP_2007_PowLaw_MagAreaRel.java
index d25a907ce3657ef47f7604da7db7d2b02679885e..d4b97d50c91ec0e65a9899fdd1793833d5798afb 100644
--- a/src/org/opensha2/eq/fault/scaling/impl/WGCEP_2007_PowLaw_MagAreaRel.java
+++ b/src/org/opensha2/eq/fault/scaling/impl/WGCEP_2007_PowLaw_MagAreaRel.java
@@ -1,22 +1,3 @@
-/*******************************************************************************
- * Copyright 2009 OpenSHA.org in partnership with
- * the Southern California Earthquake Center (SCEC, http://www.scec.org)
- * at the University of Southern California and the UnitedStates Geological
- * Survey (USGS; http://www.usgs.gov)
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
 package org.opensha2.eq.fault.scaling.impl;
 
 import org.opensha2.eq.fault.scaling.MagAreaRelationship;
diff --git a/src/org/opensha2/eq/fault/surface/Container2D.java b/src/org/opensha2/eq/fault/surface/Container2D.java
index 29766fec56717452c8aa09fe09e0beb4918aba7b..3c17b0a4cca3f3c03db363b1dfbe206f8fc066e3 100644
--- a/src/org/opensha2/eq/fault/surface/Container2D.java
+++ b/src/org/opensha2/eq/fault/surface/Container2D.java
@@ -1,22 +1,3 @@
-/*******************************************************************************
- * Copyright 2009 OpenSHA.org in partnership with
- * the Southern California Earthquake Center (SCEC, http://www.scec.org)
- * at the University of Southern California and the UnitedStates Geological
- * Survey (USGS; http://www.usgs.gov)
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
 package org.opensha2.eq.fault.surface;
 
 import java.util.ListIterator;
diff --git a/src/org/opensha2/function/DiscretizedFunc.java b/src/org/opensha2/function/DiscretizedFunc.java
index 737dd6ed482a740bc3a7eea09885a28917982f2e..951b1d757bd67fca1c7fb6600d17a0eadaa4ccc1 100644
--- a/src/org/opensha2/function/DiscretizedFunc.java
+++ b/src/org/opensha2/function/DiscretizedFunc.java
@@ -1,22 +1,3 @@
-/*******************************************************************************
- * Copyright 2009 OpenSHA.org in partnership with
- * the Southern California Earthquake Center (SCEC, http://www.scec.org)
- * at the University of Southern California and the UnitedStates Geological
- * Survey (USGS; http://www.usgs.gov)
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
 package org.opensha2.function;
 
 import java.awt.geom.Point2D;
diff --git a/src/org/opensha2/function/XY_DataSet.java b/src/org/opensha2/function/XY_DataSet.java
index b15a049b86c91002345ab6174224a7f868c67294..bb668c8b0ce2e39cf4005591b15a5703837321d3 100644
--- a/src/org/opensha2/function/XY_DataSet.java
+++ b/src/org/opensha2/function/XY_DataSet.java
@@ -18,7 +18,6 @@ import org.opensha2.util.Named;
  * 
  * @author Kevin Milner
  * @author Peter Powers
- * @version $Id: XY_DataGroup.java 10181 2013-06-04 20:41:07Z kmilner $
  */
 public interface XY_DataSet extends Named, Iterable<Point2D> {
 
diff --git a/src/org/opensha2/geo/BorderType.java b/src/org/opensha2/geo/BorderType.java
index 55b080cbd00b9661dc88a7041b482f482f6be718..5c39894e44a55e0af4b9b50e6d827e02a2ee1d5b 100644
--- a/src/org/opensha2/geo/BorderType.java
+++ b/src/org/opensha2/geo/BorderType.java
@@ -1,38 +1,16 @@
-/*******************************************************************************
- * Copyright 2009 OpenSHA.org in partnership with
- * the Southern California Earthquake Center (SCEC, http://www.scec.org)
- * at the University of Southern California and the UnitedStates Geological
- * Survey (USGS; http://www.usgs.gov)
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
 package org.opensha2.geo;
 
-
 /**
- * A <code>BorderType</code> specifies how lines connecting two points on the
- * earth's surface should be represented. A <code>BorderType</code> is required
- * for the initialization of some <code>Region</code>s.<br/>
- * <br/>
- * <img style="padding: 0px 80px; float: right;" 
- * src="{@docRoot}/img/border_differences.jpg"/>The adjacent figure shows that
- * a <code>MERCATOR_LINEAR</code> border between two <code>Location</code>s
- * with the same latitude will follow the corresponding parallel (solid line).
- * The equivalent <code>GREAT_CIRCLE</code> border segment will follow the
- * shortest path between the two <code>Location</code>s (dashed line).<br/>
- * <br/>
- * <br/>
+ * A {@code BorderType} specifies how lines connecting two points on the earth's
+ * surface should be represented. A {@code BorderType} is required for the
+ * initialization of some Regions.
+ * 
+ * <p><img style="padding: 0px 80px; float: right;" src=
+ * "{@docRoot}/resources/border_differences.jpg"/>The adjacent figure shows that
+ * a {@code MERCATOR_LINEAR} border between two {@code Location}s with the same
+ * latitude will follow the corresponding parallel (solid line). The equivalent
+ * {@code GREAT_CIRCLE} border segment will follow the shortest path between the
+ * two {@code Location}s (dashed line).
  * 
  * @author Peter Powers
  * @see Region
@@ -40,15 +18,15 @@ package org.opensha2.geo;
  */
 public enum BorderType {
 
-	/** 
-	 * Defines a {@link Region} border as following a straight
-	 * line in a Mercator projection
+	/**
+	 * Defines a {@link Region} border as following a straight line in a
+	 * Mercator projection
 	 */
 	MERCATOR_LINEAR,
-	
+
 	/**
 	 * Defines a {@link Region} border as following a great circle.
 	 */
 	GREAT_CIRCLE;
-	
+
 }
diff --git a/src/org/opensha2/geo/GriddedRegion.java b/src/org/opensha2/geo/GriddedRegion.java
index 20a2e58680ec460c13c163dbc090b7a9e416d772..3eee4ec896de3e643727ff672fb5983837e37a32 100644
--- a/src/org/opensha2/geo/GriddedRegion.java
+++ b/src/org/opensha2/geo/GriddedRegion.java
@@ -1,21 +1,3 @@
-/*******************************************************************************
- * Copyright 2009 OpenSHA.org in partnership with the Southern California
- * Earthquake Center (SCEC, http://www.scec.org) at the University of Southern
- * California and the UnitedStates Geological Survey (USGS; http://www.usgs.gov)
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- ******************************************************************************/
-
 package org.opensha2.geo;
 
 import static com.google.common.base.Preconditions.checkArgument;
@@ -35,15 +17,15 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Range;
 
 /**
- * A {@code GriddedRegion} is a {@link Region} that has been discretized in
- * latitude and longitude. Each node in a gridded region represents a small area
- * that is some number of degrees in width and height and is identified by a
- * unique {@link Location} at the geographic (lat-lon) center of the node. <img
- * style="padding: 30px 40px; float: right;" src="{@docRoot}
- * /img/gridded_regions_border.jpg"/> In the adjacent figure, the heavy black
- * line marks the border of the {@code Region} . The light gray dots mark the
- * {@code Location}s of nodes outside the region, and black dots those inside
- * the region. The dashed grey line marks the border, inside which, a
+ * <img style="padding: 30px 40px; float: right;" src="
+ * {@docRoot}/resources/gridded_regions_border.jpg"/>A {@code GriddedRegion} is
+ * a {@link Region} that has been discretized in latitude and longitude. Each
+ * node in a gridded region represents a small area that is some number of
+ * degrees in width and height and is identified by a unique {@link Location} at
+ * the geographic (lat-lon) center of the node. In the adjacent figure, the
+ * heavy black line marks the border of the {@code Region}. The light gray dots
+ * mark the {@code Location}s of nodes outside the region, and black dots those
+ * inside the region. The dashed grey line marks the border, inside which, a
  * {@code Location} will be associated with a grid node. See
  * {@link GriddedRegion#indexForLocation(Location)} for more details on rules
  * governing whether a grid node is inside a region and whether a
@@ -52,29 +34,32 @@ import com.google.common.collect.Range;
  * <p>The {@code Location}s of the grid nodes are indexed internally in order of
  * increasing longitude then latitude starting with the node at the lowest
  * latitude and longitude in the region. {@code GriddedRegion}s are iterable as
- * a shorthand for {@code getNodeList().iterator()}. </p>
+ * a shorthand for {@code getNodeList().iterator()}.
  * 
  * <p>Internally, {@code GriddedRegion}s use an anchor {@code Location} to
  * ensure grid nodes fall on specific lat-lon values. This location can be
  * anywhere in- or outside the region to be gridded. If the region contains the
  * anchor location, the anchor will coincide with a grid node. For example,
- * given a grid spacing of 1° and an anchor {@code Location} of 22.1°N
- * -134.7°W, grid nodes within any region will fall at whole valued
- * latitudes + 0.1° and longitudes - 0.7°.</p>
+ * given a grid spacing of 1° and an anchor {@code Location} of 22.1°N -134.7°W,
+ * grid nodes within any region will fall at whole valued latitudes + 0.1° and
+ * longitudes - 0.7°.
  * 
- * <p><a name="note"></a> <b><Note:</b> Due to rounding errors and the use of an
+ * <p><a name="note"></a> <b>Note:</b> Due to rounding errors and the use of an
  * {@link Area} internally to define a {@code Region}'s border,
  * {@link Region#contains(Location)} may not always return the expected result
  * near a border. See {@link Region#contains(Location)} for further details. For
  * a {@code GriddedRegion}, this results in values returned by calls
  * {@link #minGridLat()} etc. for which there may not be any grid nodes. To
  * guarantee node coverage for a {@code GriddedRegion}, say for eventual map
- * output, 'best-practice' dictates expanding a region slightly.</p>
+ * output, 'best-practice' dictates expanding a region slightly.
+ * 
+ * <p>Use the {@link Regions} factory class to create new gridded regions.
  * 
  * @author Nitin Gupta
  * @author Vipin Gupta
  * @author Peter Powers
  * @see Region
+ * @see Regions
  */
 public class GriddedRegion extends Region implements Iterable<Location> {
 
@@ -187,7 +172,8 @@ public class GriddedRegion extends Region implements Iterable<Location> {
 		return true;
 	}
 
-	@Override public boolean equals(Object obj) {
+	@Override
+	public boolean equals(Object obj) {
 		if (this == obj) return true;
 		if (!(obj instanceof GriddedRegion)) return false;
 		GriddedRegion gr = (GriddedRegion) obj;
@@ -195,7 +181,8 @@ public class GriddedRegion extends Region implements Iterable<Location> {
 		return equalsRegion(gr);
 	}
 
-	@Override public int hashCode() {
+	@Override
+	public int hashCode() {
 		return super.hashCode() ^ anchor.hashCode() ^ Double.valueOf(latSpacing).hashCode() ^
 			Double.valueOf(lonSpacing).hashCode();
 	}
@@ -211,12 +198,14 @@ public class GriddedRegion extends Region implements Iterable<Location> {
 	 * @throws UnsupportedOperationException
 	 * @see Region#addInterior(Region)
 	 */
-	@Override public void addInterior(Region region) {
+	@Override
+	public void addInterior(Region region) {
 		throw new UnsupportedOperationException(
 			"A GriddedRegion may not have an interior Region set");
 	}
 
-	@Override public Iterator<Location> iterator() {
+	@Override
+	public Iterator<Location> iterator() {
 		return nodes.iterator();
 	}
 
@@ -346,8 +335,8 @@ public class GriddedRegion extends Region implements Iterable<Location> {
 	 * value of each. Remember that both methods test for insidedness according
 	 * to the rules defined in the {@link Shape} interface. <br/> <img
 	 * style="padding: 20px; display: block; margin-left:auto;
-	 * margin-right:auto;" src="{@docRoot} /img/node_association.jpg"/> <br/>
-	 * <table id="table-a"> <thead> <tr> <th>Location</th> <th>
+	 * margin-right:auto;" src="{@docRoot}/resources/node_association.jpg"/>
+	 * <br/> <table id="table-a"> <thead> <tr> <th>Location</th> <th>
 	 * {@code contains(Location)}</th> <th>{@code indexForLocation(Location)}
 	 * </th> </tr> <thead> <tbody> <tr> <td><b>A</b></td> <td>{@code true}</td>
 	 * <td>-1</td> </tr> <tr> <td><b>B</b></td> <td>{@code false}</td>
diff --git a/src/org/opensha2/geo/LocationGrid.java b/src/org/opensha2/geo/LocationGrid.java
index a0f408182f834540b68ef8d877ba2e3664a3d195..ac830e8690c4eaeaadb071c0bfee18a109464a92 100644
--- a/src/org/opensha2/geo/LocationGrid.java
+++ b/src/org/opensha2/geo/LocationGrid.java
@@ -135,7 +135,6 @@ public final class LocationGrid implements Iterable<Location> {
 	 * @param rowWidth number of rows in the window
 	 * @param columnStart first column of window
 	 * @param columnWidth
-	 * @return
 	 */
 	public LocationGrid window(int rowStart, int rowWidth, int columnStart, int columnWidth) {
 		checkElementIndex(rowStart, this.rowWidth);
diff --git a/src/org/opensha2/geo/Region.java b/src/org/opensha2/geo/Region.java
index 5f67a4d6f6c072a4714f68a8629a0c01eeb979d9..ce1b734b85b379440afd1e786bdb2f99a41e196f 100644
--- a/src/org/opensha2/geo/Region.java
+++ b/src/org/opensha2/geo/Region.java
@@ -1,21 +1,3 @@
-/*******************************************************************************
- * Copyright 2009 OpenSHA.org in partnership with the Southern California
- * Earthquake Center (SCEC, http://www.scec.org) at the University of Southern
- * California and the UnitedStates Geological Survey (USGS; http://www.usgs.gov)
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- ******************************************************************************/
-
 package org.opensha2.geo;
 
 import static org.opensha2.geo.GeoTools.PI_BY_2;
@@ -55,28 +37,30 @@ import com.google.common.primitives.Doubles;
  * same as linear, Mercator paths. Over longer distances, a great circle is a
  * better representation of a line on a globe. Internally, great circles are
  * approximated by multiple straight line segments that have a maximum length of
- * 100km.</p>
+ * 100km.
  * 
  * <p>A {@code Region} may also have interior (or negative) areas. Any call to
  * {@link Region#contains(Location)} for a {@code Location} within or on the
  * border of such an interior area will return {@code false}, subject to the
- * rules of insidedness.</p>
+ * rules of insidedness.
  * 
  * <p><b>Note:</b> The current implementation does not support regions that are
  * intended to span ±180°. Any such regions will wrap the long way around the
  * earth and results are undefined. Regions that encircle either pole are not
- * supported either.</p>
+ * supported either.
  * 
  * <p><b>Note:</b> Due to rounding errors and the use of an {@link Area}
  * internally to define a {@code Region}'s border,
  * {@link Region#contains(Location)} may not always return the expected result
  * near a border. See {@link Region#contains(Location)} for further details.</p>
  * 
+ * <p>Use the {@link Regions} factory class to create new regions.
+ * 
  * @author Peter Powers
- * @version $Id: Region.java 9320 2012-08-23 16:47:45Z pmpowers $
  * @see Shape
  * @see Area
  * @see BorderType
+ * @see Regions
  */
 public class Region implements Named {
 
@@ -340,7 +324,7 @@ public class Region implements Named {
 	 * @param loc the Location to compute a distance to
 	 * @return the minimum distance between this {@code Region} and a point
 	 * @throws NullPointerException if supplied location is {@code null}
-	 * @see LocationList#minDistToLine(Location)
+	 * @see Locations#minDistanceToLine(Location, LocationList)
 	 * @see Locations#distanceToSegmentFast(Location, Location, Location)
 	 */
 	public double distanceToLocation(Location loc) {
diff --git a/src/org/opensha2/geo/RegionUtils.java b/src/org/opensha2/geo/RegionUtils.java
index a8c03b64158372e96f282e6b7aacd8d2aadc9a71..78b58d80608c4f634fd89f70644c0f0c962899d9 100644
--- a/src/org/opensha2/geo/RegionUtils.java
+++ b/src/org/opensha2/geo/RegionUtils.java
@@ -1,22 +1,3 @@
-/*******************************************************************************
- * Copyright 2009 OpenSHA.org in partnership with
- * the Southern California Earthquake Center (SCEC, http://www.scec.org)
- * at the University of Southern California and the UnitedStates Geological
- * Survey (USGS; http://www.usgs.gov)
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
 package org.opensha2.geo;
 
 
diff --git a/src/org/opensha2/geo/Regions.java b/src/org/opensha2/geo/Regions.java
index 0c59b508fcb2f8fd89f41546a69bd7605003776e..9243441901b958c780465b0f8d02f5527012ae03 100644
--- a/src/org/opensha2/geo/Regions.java
+++ b/src/org/opensha2/geo/Regions.java
@@ -43,13 +43,17 @@ public class Regions {
 	}
 
 	/**
-	 * Creates a {@code GriddedRegion} from a list of border locations. The
-	 * border type specifies whether lat-lon values are treated as points in an
-	 * orthogonal coordinate system or as connecting great circles. The border
-	 * {@code LocationList} does not need to repeat the first {@code Location}
-	 * at the end of the list. If the supplied {@code anchor Location} is
-	 * {@code null}, it is automatically set to the Location defined by the
-	 * minimum latitude and longitude of the region's border.
+	 * <img style="padding: 30px 40px; float: right;" src=
+	 * "{@docRoot}/resources/gridded_regions_border.jpg"/>Creates a
+	 * {@code GriddedRegion} from a list of border locations.
+	 * 
+	 * <p>The border type specifies whether lat-lon values are treated as points
+	 * in an orthogonal coordinate system or as connecting great circles. The
+	 * border {@code LocationList} does not need to repeat the first
+	 * {@code Location} at the end of the list. If the supplied
+	 * {@code anchor Location} is {@code null}, it is automatically set to the
+	 * Location defined by the minimum latitude and longitude of the region's
+	 * border.
 	 * 
 	 * @param name of the {@code GriddedRegion}; may be {@code null}
 	 * @param border {@code Locations}
@@ -141,9 +145,22 @@ public class Regions {
 	}
 
 	/**
-	 * Creates a circular {@code Region}. Internally, the centerpoint and radius
-	 * are used to create a circular region composed of straight line segments
-	 * that span 10° wedges.
+	 * <img style="padding: 30px 40px; float: right;" src=
+	 * "{@docRoot}/resources/gridded_regions_circle.jpg"/>Creates a circular
+	 * {@code Region}. Internally, the centerpoint and radius are used to create
+	 * a circular region composed of straight line segments that span 10°
+	 * wedges.
+	 * 
+	 * <p>Passing the resultant region
+	 * {@link #toGridded(Region, double, double, Location)} yields a
+	 * {@link GriddedRegion} like that in the adjacent figure. The heavy black
+	 * line marks the border of the {@code Region}. The light gray dots mark the
+	 * {@code Location}s of nodes outside the region, and black dots those
+	 * inside the region. The dashed grey line marks the border, inside which, a
+	 * {@code Location} will be associated with a grid node. See
+	 * {@link GriddedRegion#indexForLocation(Location)} for more details on
+	 * rules governing whether a grid node is inside a region and whether a
+	 * {@code Location} will be associated with a grid node.
 	 * 
 	 * @param name of the {@code Region}; may be {@code null}
 	 * @param center of the circle
@@ -160,7 +177,19 @@ public class Regions {
 	}
 
 	/**
-	 * Creates a {@code Region} as a buffered area around a line.
+	 * <img style="padding: 30px 40px; float: right;" src=
+	 * "{@docRoot}/resources/gridded_regions_buffer.jpg"/>Creates a
+	 * {@code Region} as a buffered area around a line.
+	 * 
+	 * <p>Passing the resultant region
+	 * {@link #toGridded(Region, double, double, Location)} yields a
+	 * {@link GriddedRegion} like that in the adjacent figure. The light gray
+	 * dots mark the {@code Location}s of nodes outside the region, and black
+	 * dots those inside the region. The dashed grey line marks the border,
+	 * inside which, a {@code Location} will be associated with a grid node. See
+	 * {@link GriddedRegion#indexForLocation(Location)} for more details on
+	 * rules governing whether a grid node is inside a region and whether a
+	 * {@code Location} will be associated with a grid node.
 	 * 
 	 * @param name of the {@code Region}; may be {@code null}
 	 * @param line at center of buffered {@code Region}
@@ -271,8 +300,8 @@ public class Regions {
 
 	/**
 	 * Convenience method to return a {@code Region} spanning the entire globe.
-	 * @return a {@code Region} extending from -180° to +180°
-	 *         longitude and -90° to +90° latitude
+	 * @return a {@code Region} extending from -180° to +180° longitude and -90°
+	 *         to +90° latitude
 	 */
 	public static Region global() {
 		// @formatter:off
diff --git a/src/org/opensha2/gmm/GmmInput.java b/src/org/opensha2/gmm/GmmInput.java
index 79dc9f820007c560401b34a1fd66320f701e1133..be083b80ce5506fb42c7e927ee0a86e5ebd37c96 100644
--- a/src/org/opensha2/gmm/GmmInput.java
+++ b/src/org/opensha2/gmm/GmmInput.java
@@ -610,8 +610,7 @@ public class GmmInput {
 		}
 
 		/**
-		 * 
-		 * @return
+		 * The default allowed values for each input field.
 		 */
 		public static Constraints defaults() {
 			return builder().withDefaults().build();
diff --git a/src/org/opensha2/mfd/YC_1985_CharMfd.java b/src/org/opensha2/mfd/YC_1985_CharMfd.java
index 721a6fd25a4b031b97ea93b2ae500e4ff5059596..a5b7944a97bf99eae445bf79457d822fb86753e4 100644
--- a/src/org/opensha2/mfd/YC_1985_CharMfd.java
+++ b/src/org/opensha2/mfd/YC_1985_CharMfd.java
@@ -1,22 +1,3 @@
-/*******************************************************************************
- * Copyright 2009 OpenSHA.org in partnership with
- * the Southern California Earthquake Center (SCEC, http://www.scec.org)
- * at the University of Southern California and the UnitedStates Geological
- * Survey (USGS; http://www.usgs.gov)
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ******************************************************************************/
-
 package org.opensha2.mfd;
 
 
diff --git a/src/org/opensha2/programs/HazardCalc.java b/src/org/opensha2/programs/HazardCalc.java
index 5d6adb9fbc765e8071e2f74cf5f22ff45cd67c00..b8c9806dc65f95d1e8fa09529b6b61a49348b27b 100644
--- a/src/org/opensha2/programs/HazardCalc.java
+++ b/src/org/opensha2/programs/HazardCalc.java
@@ -138,7 +138,7 @@ public class HazardCalc {
 			return Sites.fromString(arg);
 		} catch (Exception e) {
 			throw new IllegalArgumentException(
-				"Sites [" + arg + "] must either be a 3 to 7 argument, comma-delimited string " +
+				"'sites' [" + arg + "] must either be a 3 to 7 argument, comma-delimited string " +
 					"or specify a path to a *.csv or *.geojson file", e);
 		}
 	}