Orbwalker+small tweak