Replaced wget with http + minor fixes