add genre to picture_info
fixes for dates etc
merging master