tidy up "assembly", magic numbers
more cleanup
less spammy upload status reports