updated to fix some bugs from changes to URL structure