Changed _ to $

And some other fixes.