more label improvements