Updated to make base url easier to change
Fixed small bug