More file types and a tweak to close #177