Mostly fixes to WP translation code __ and _e, along with some formatting improvements.