routing tweaks.
undid test code