Bootstrapper fixes. Routing system improved.