dollar function: bug and TODO squashing