Cleaned up photo code a little.. added a little more untested
funcionality