Updated router to match serial API
Some very small tweaks