adds better uri encoding
removes todo from readme