refactored source; fixed default text