Some tweaks to operands' names and fixed major bug in toString