Fixed bugs, tweaked output text