Updated todo
Updated samples, fixed encoding