Added Navigator class; misc updates.