added changes from matthias; scaling and uploading pictures;