misc fixes. comments