various formula fixes/improvements