Final touches on source