Update to 10-6-2014 with a bit more stuff