Switch fully to new source positions, misc fixes.