Finished logging opts, testing inc
srcmark changes