fixed a nonuniform uri
setup and manifest changes