Cleanup, added a download function.