Added all venues, more bug fixes