Lots of fixes + new source field