Fixed block match race conditions
Fixed a few minor issues
Made check-in to copy files if the target file doesn't exist