Some cleanups + sync marks

I think with these changes, we'd be ready for merge.