master as of 1-Jun-2014
sums and more update