routing cleanup, added more bypass caps