Update 20AUG2014

A lot of fixes.