+++ Bug fixes
+++ PhotoShare adapt