biat fixes - mostly cosmetics