Merged some improvements from 2014_02_13_LO_dependence