Minor tweaks, added dollar signs etc