more types, fix urls, etc.