Updates based on jbuck's comments