Full featured routing system and other minor improvements