Ok'd a couple of ES edits...

Feel free to ignore... just synching to avoid conflicts...