bugfixes and started with photo handling