working now, clean up strings and labels