URL Fix & Cleanups