Some Fixes

Also fixed a major photo album issue