misc updates
make picture name windows friendly