minor cleanup and bix fixes