WIP:  fixed some url routing, and other bugs

exposed even more bugs