minor all around fixes