Processed some of slodge's comments