fixed unused import warings and added some missing comments.