updated comments and fixed imports