Bug fixes; supporting materials