Various updates and adjustments. 2014.