NJT: Added train number, fixed regex, better source url