Si: venues directory update plus other minor changes
Si: Obligitory merge