clean up space, fix base url