various changes
redid routing