Some small fixes in routing section

Small fixes in routing.. will be reading other sections and if needed I will help...