Refined the url
Fix various minor bugs