more file types, minor alterations