mass upload + bugfixes