fix post-rel bugs
refactoring router