Berlin 2014: Minor fixes and typos.