Few bug fixes, better photo handling