some more stuff added(mainly routing)