More comments and bug fixed.