cleanups to building and uploading, from code review