updates and minor tuning at the beginning of September 2014