Clean up and updates November 8-2014