clean up, works except move with text sometimes reports a string and not a bool