Fix url parameters and add more toDO tasks