dollars are closed properly + other bug fixes