Replacing unmeaningful variable names

Some variables were one or two characters long and lines like "if @v" or "unless @s" were incomprehensible, without having to go back to the definitions all the time. I've changed them to be more meaningful, they are still short.