[wip] converting to Text
completed transition to Text
cleanup compiler warnings