Fix times after midnight and add more transport modes