Fixed used imports; fixed doc