Many changes in a bid to solve the URL issues I've been having.