added import and minor fixes