Filename bugs resolved.