Updated direction handling.  Added defaults, fixed rider count