made pomegranate a little more friendly to users
fixed up picture uploads so as to make sure they don't collide
fixed merge errors