Best config so far.
Latest fixes and improvments, mostly in sync with SVN.