fixes per comments

take this as a basis.