address some commit concerns