touchups to prev commit