fixes per comments...