updated var names and url param processing