propegated #39 to data string, renamed variables, warning fixes, documentation