Fix bulk update, clean up bulk upload code, add some more error messaging