safari fixes and routes