fixed IV / BS  / DR, changed macros