router fixes & better date parsing