Bugfixes, Upload Improve and archive #25 #17