fixes per review comments