some fixes. #2