add if__Infinite__ booleans, small plotting fixes