Added build_url function
Corrected comments