dollars formatted right and cleaned up some loose ends