rounded out some changes