Restructured /arrivals
Added more performance enhancements to /arrivals; Fixes #6