Bug fixes and enhancements to Artifact.