file source/store; cleanup; spec fixes