fix Object.prototype.toString
clean up @string and remove uses of $__