also upload thumbs;
clean up code;