fixes for revised routes & object wrapping